From 85a6c99d58f00f59ab8e2a749eaf6d4e805177b6 Mon Sep 17 00:00:00 2001 From: "Matteo F. Vescovi" Date: Sat, 31 Dec 2011 12:15:04 +0100 Subject: [PATCH] Imported Upstream version 0.1.0 --- AUTHORS | 12 + COPYING | 827 +--- COPYING.LESSER | 165 - ChangeLog | 687 ++- INSTALL | 10 +- Makefile.am | 6 +- Makefile.in | 188 +- NEWS | 7 + README | 202 +- acinclude.m4 | 62 + aclocal.m4 | 219 +- babl/Makefile.am | 62 +- babl/Makefile.in | 266 +- babl/babl-class.h | 69 + babl/babl-classes.h | 91 + babl/babl-component.c | 3 +- babl/babl-component.h | 20 +- babl/babl-conversion.c | 15 +- babl/babl-conversion.h | 39 +- babl/babl-core.c | 33 +- babl/babl-cpuaccel.c | 2 +- babl/babl-cpuaccel.h | 2 +- babl/babl-db.c | 1 + babl/babl-db.h | 4 +- babl/babl-extension.c | 27 +- babl/babl-extension.h | 19 +- babl/babl-fish-path.c | 10 +- babl/babl-fish-reference.c | 31 +- babl/babl-fish-simple.c | 1 + babl/babl-fish-stats.c | 38 +- babl/babl-fish.c | 13 +- babl/babl-fish.h | 28 +- babl/babl-format.c | 57 +- babl/babl-format.h | 34 +- babl/babl-hash-table.c | 1 + babl/babl-ids.h | 2 +- babl/babl-image.c | 11 +- babl/babl-image.h | 38 +- babl/babl-internal.c | 3 +- babl/babl-internal.h | 107 +- babl/babl-introspect.c | 17 +- babl/babl-introspect.h | 26 + babl/babl-list.c | 1 + babl/babl-list.h | 9 +- babl/babl-macros.h | 33 + babl/babl-memory.c | 1 + babl/babl-model.c | 3 +- babl/babl-model.h | 30 +- babl/babl-sampling.c | 11 +- babl/babl-sampling.h | 18 +- babl/babl-sanity.c | 27 +- babl/babl-type.c | 3 +- babl/babl-type.h | 28 +- babl/babl-types.h | 49 + babl/babl-util.c | 1 + babl/babl-version.c | 1 + babl/babl-version.h | 9 +- babl/babl-version.h.in | 5 + babl/babl.c | 35 +- babl/babl.h | 280 +- babl/base/Makefile.am | 6 +- babl/base/Makefile.in | 145 +- babl/base/babl-base.c | 1 + babl/base/formats.c | 448 +- babl/base/model-gray.c | 86 +- babl/base/model-rgb.c | 142 +- babl/base/model-ycbcr.c | 81 +- babl/base/rgb-constants.h | 4 +- babl/base/type-float.c | 10 +- babl/base/type-u16.c | 11 +- babl/base/type-u32.c | 11 +- babl/base/type-u8.c | 31 +- babl/base/util.h | 7 + babl/gettimeofday.c | 1 + config.h.in | 15 +- configure | 6906 ++++++++++++++++++------------- configure.ac | 32 +- depcomp | 93 +- docs/Makefile.am | 20 +- docs/Makefile.in | 163 +- docs/graphics/Makefile.am | 20 +- docs/graphics/Makefile.in | 137 +- docs/graphics/babl-16x16.png | Bin 555 -> 504 bytes docs/graphics/babl-48x48.png | Bin 1936 -> 1868 bytes docs/graphics/babl-a4poster.png | Bin 32871 -> 34452 bytes docs/index-static.html.in | 10 +- docs/tools/xml_insert.sh | 92 +- extensions/CIE-Lab.c | 9 +- extensions/Makefile.am | 71 +- extensions/Makefile.in | 380 +- extensions/gegl-fixups.c | 108 +- extensions/gggl-lies.c | 1 + extensions/gggl.c | 1 + extensions/gimp-8bit.c | 1 + extensions/naive-CMYK.c | 1 - extensions/sse-fixups.c | 2 + extensions/util.h | 4 +- install-sh | 514 ++- ltmain.sh | 12 +- missing | 61 +- tests/Makefile.am | 20 +- tests/Makefile.in | 293 +- tests/babl-html-dump.c | 21 +- tests/babl_class_name.c | 3 +- tests/babl_fish_path_dhtml.c | 3 +- tests/babl_fish_path_fitness.c | 18 +- tests/conversions.c | 5 +- tests/formats.c | 5 +- tests/grayscale_to_rgb.c | 3 +- tests/introspect.c | 3 +- tests/models.c | 5 +- tests/nop.c | 3 +- tests/rgb_to_bgr.c | 3 +- tests/rgb_to_ycbcr.c | 3 +- tests/sanity.c | 3 +- tests/srgb_to_lab_u8.c | 3 +- tests/types.c | 5 +- 117 files changed, 8170 insertions(+), 5865 deletions(-) delete mode 100644 COPYING.LESSER create mode 100644 babl/babl-class.h create mode 100644 babl/babl-classes.h create mode 100644 babl/babl-introspect.h create mode 100644 babl/babl-macros.h create mode 100644 babl/babl-types.h diff --git a/AUTHORS b/AUTHORS index b38283a..6456945 100644 --- a/AUTHORS +++ b/AUTHORS @@ -18,4 +18,16 @@
Sparse fixes and sanity.
dmacks at netspace.org
Build sanity
+
Sam Hocevar
+
Build sanity.
+
Zhang Junbo
+
Frequency domain color model.
+
Martin Nordholts
+
Optimizations and API overhaul.
+
Gary V. Vaughan
+
Multiplatform build support.
+
Stanislav Brabec
+
Portability patch.
+
Hubert Figuiere
+
C++ friendliness patch.
diff --git a/COPYING b/COPYING index 94a9ed0..fc8a5de 100644 --- a/COPYING +++ b/COPYING @@ -1,674 +1,165 @@ - GNU GENERAL PUBLIC LICENSE + GNU LESSER GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. diff --git a/COPYING.LESSER b/COPYING.LESSER deleted file mode 100644 index fc8a5de..0000000 --- a/COPYING.LESSER +++ /dev/null @@ -1,165 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. diff --git a/ChangeLog b/ChangeLog index 446a78a..a81c443 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,691 @@ +=========================== 0.1.0 released ============================= + +2009-05-20 Martin Nordholts + + * configure.ac: Bump version to 0.1.0 and make sure the link name + remains `babl-0.0'. + +2009-05-20 Martin Nordholts + + * docs/Makefile.am: Also add .libs directories to the BABL_PATHs + so that e.g. the BablFishPath introspection chart is properly + generated when doing a build, at least on Linux. + +2009-05-20 Martin Nordholts + + * docs/index-static.html.in: Convert SVN references to git + +2009-05-19 Martin Nordholts + + Update for 0.1.0 release. + + * AUTHORS + * NEWS + +2009-05-16 Hubert Figuiere + + Add extern "C" to the header for C++ friendliness. + + * babl/babl.h + +2009-04-04 Martin Nordholts + + Bug 568576 – [PATCH] undefined operation fix + + Patch from Stanislav Brabec + + * babl/babl-fish-stats.c + * tests/babl_fish_path_fitness.c + +2009-04-04 Martin Nordholts + + * AUTHORS: Update for 0.1.0 release. + +2009-04-04 Martin Nordholts + + * extensions/Makefile.am: extensions: util.h is part of the + source. make distcheck passes now. + +2009-04-04 Martin Nordholts + + * babl/Makefile.am: Add forgotten header files that needs to be + distributed with a release. + +2009-04-04 Martin Nordholts + + * Makefile.am: We don't have a COPYING.LESSER anymore + +2009-04-03 Martin Nordholts + + * NEWS: Updated for 0.1.0 + +2009-03-31 Martin Nordholts + + * babl/babl-internal.h: Patch from Gary V. Vaughan. Avoid the need + for define __func__ "unknown" on some vendor compilers + +2009-03-31 Martin Nordholts + + * configure.ac: Patch from Gary V. Vaughan. Don't try to pass gcc + flags to vendor compilers + +2009-03-25 Martin Nordholts + + Patch from Gary V. Vaughan. Rewrite xml-insert.sh in portable + bourne-shell + + * docs/Makefile.am + * docs/tools/xml_insert.sh + +2009-03-25 Martin Nordholts + + Patch from Gary V. Vaughan. Don't use depecrated features or + reduntant declarations in Makefile.am + + * babl/Makefile.am + * babl/base/Makefile.am + * docs/Makefile.am + * tests/Makefile.am + +2009-03-25 Martin Nordholts + + Patch from Gary V. Vaughan. Support hpux use of shl load/unload + and dsos with .sl suffixes + + * babl/babl-extension.c + * configure.ac + * extensions/Makefile.am + * tests/Makefile.am + +2008-03-27 Kevin Cozens + + * configure.ac: + * docs/graphics/Makefile.am: Applied patch from Matteo 'Peach' + Pescarin which makes build use rsvg binary instead of inkscape + to create pngs. Fixes bug 571516. + +2009-03-26 Manish Singh + + * configure.ac: BABL_VARIADIC_MACROS needs to be called before + the libtool stuff (which implicitly calls AC_PROG_CXX) + +2009-03-25 Martin Nordholts + + Patch from Gary V. Vaughan. NULL-statements caused by trailing + commas are non-portable. + + * babl/base/type-u16.c + * babl/base/type-u32.c + * babl/base/type-u8.c + * extensions/CIE-Lab.c + +2009-03-25 Martin Nordholts + + Apply patch from Gary V. Vaughan that adds configure time checks + for variadic macros and adapts the definitions of such macros + in-code accordingly so that babl can be compiled on more + platforms. + + * acinclude.m4 + * babl/babl-internal.h + * configure.ac + +2009-03-25 Martin Nordholts + + * babl/babl-fish.c: Patch from Gary V. Vaughan. Some vendor + compilers can't compile non-constant elements of compound struct + initializers + +2009-03-25 Martin Nordholts + + Patch from Gary V. Vaughan. Some vendor C compilers choke on C++ + comments. + + * babl/babl-fish-path.c + * babl/babl-fish-stats.c + * babl/base/model-rgb.c + * babl/base/rgb-constants.h + * tests/babl_fish_path_fitness.c + +2009-03-25 Martin Nordholts + + * babl/babl-cpuaccel.h: Patch from Gary V. Vaughan. enum values + must be less than INT_MAX (sign bit is illegal) + +2009-03-25 Martin Nordholts + + * babl/babl-ids.h: Patch from Gary V. Vaughan. Remove trailing + comma in enum declaration. + +2009-03-25 Martin Nordholts + + Apply patch from Gary V. Vaughan that includes config.h in some + files that missed it. + + * babl/base/conversions-type.c + * babl/base/model-cmyk.c + +2009-02-24 Sven Neumann + + * */*.c: based on a patch from Gary V. Vaughan, include "config.h" + before any other header file from all .c files. + + * babl/babl-internal.h + * extensions/util.h: instead of including config.h from here, bail + out if it wasn't included beforehand. + +2009-02-20 Martin Nordholts + + * babl/babl.h: Include headers in babl.h as system headers + +2009-01-26 Sven Neumann + + * babl/babl.h + * babl/babl-format.c: renamed babl_format_get_num_of_components() + to babl_format_get_n_components(). + (babl_format_has_alpha): changed accordingly. + +2009-01-24 Martin Nordholts + + Do a complete overhaul of the babl API. + + * babl/babl.h: Instead of including subsystem headers, declare the + functions part of the API directly in the header. The public + types, macros and the version header is still pulled in as + includes but with inclusion guards that prevent them from being + included separately by clients. Notable things removed from the + API is internal class functions and the class instance structs. + + (babl_format_has_alpha) + (babl_format_get_bytes_per_pixel) + (babl_format_get_num_of_components) + (babl_format_get_type): New getters to allow the Babl union to + become opaque for clients. + + * babl/babl-types.h: New file with public types. Currently only + the opaque Babl union and the linear and planar conversion + function prototypes (which are not used in the API due to the use + of varags but still part of the API for reference) are there. Make + sure it's only included indirectly through babl.h. + + * babl/babl-macros.h + * babl/babl-version.h.in: Make sure these are not included + directly, only indirectly through babl.h. + + * babl/babl-main.h: Removed, function declarations are in babl.h + now. + + * babl/babl-internal.h: Include the headers we now consider + internal, mostly the different class headers. + + * babl/babl-class.h: The "named class" function declarations are + now in the public header so move them away from this internal + header. + + * babl/babl-image.h + * babl/babl-format.h + * babl/babl-fish.h + * babl/babl-extension.h + * babl/babl-conversion.h + * babl/babl-component.h + * babl/babl-classes.h + * babl/babl-introspect.h + * babl/babl-sampling.h + * babl/babl-model.h + * babl/babl-type.h: Adapt to above changes, move relevant things to babl.h + + * babl/base/formats.c + * babl/base/model-gray.c + * babl/base/model-rgb.c + * babl/base/model-ycbcr.c + * babl/base/type-float.c: Explicitly #include "babl-classes.h". + + * babl/babl-internal.c: s/babl_name/babl_get_name/ + + * babl/babl-format.c + (babl_format_has_alpha) + (babl_format_get_bytes_per_pixel) + (babl_format_get_num_of_components) + (babl_format_get_type): Implement these. + + * babl/Makefile.am: Don't install the now internal headers and + add, remove and install the other headers according to above + changes. + +2009-01-18 Martin Nordholts + + Since babl_foo_from_id() will not be part of the public API we can + revert to having the short variant babl_foo() instead of + babl_foo_from_name(). + + * babl/babl-class.h + * babl/babl-component.h + * babl/babl-conversion.c + * babl/babl-conversion.h + * babl/babl-extension.h + * babl/babl-fish-path.c + * babl/babl-fish.c + * babl/babl-format.c + * babl/babl-format.h + * babl/babl-image.c + * babl/babl-internal.h + * babl/babl-model.c + * babl/babl-model.h + * babl/babl-type.c + * babl/babl-type.h + * extensions/CIE-Lab.c + * extensions/frequency.c + * extensions/gegl-fixups.c + * extensions/gggl-lies.c + * extensions/gggl.c + * extensions/gimp-8bit.c + * extensions/naive-CMYK.c + * extensions/sse-fixups.c + * tests/grayscale_to_rgb.c + * tests/rgb_to_bgr.c + * tests/rgb_to_ycbcr.c + +2009-01-18 Martin Nordholts + + Add include guards. + + * babl/babl-component.h + * babl/babl-conversion.h + * babl/babl-extension.h + * babl/babl-fish.h + * babl/babl-format.h + * babl/babl-image.h + * babl/babl-model.h + * babl/babl-sampling.h + * babl/babl-type.h + +2009-01-18 Martin Nordholts + + * babl/babl-db.h: Namespace the include guard. + +2009-01-18 Martin Nordholts + + Do a s/babl_destroy/babl_exit since 'destroy' is better paired + with a 'create' and other libraries also use the 'init'/'exit' + pair, including GEGL. Keep a define for babl_destroy unless + BABL_DISABLE_DEPRECATED is defined. + + * babl/babl-main.h + * babl/babl.c + * tests/babl-html-dump.c + * tests/babl_class_name.c + * tests/babl_fish_path_dhtml.c + * tests/babl_fish_path_fitness.c + * tests/conversions.c + * tests/formats.c + * tests/grayscale_to_rgb.c + * tests/introspect.c + * tests/models.c + * tests/nop.c + * tests/rgb_to_bgr.c + * tests/rgb_to_ycbcr.c + * tests/sanity.c + * tests/srgb_to_lab_u8.c + * tests/types.c + +2009-01-18 Martin Nordholts + + * babl/babl-classes.h: New file collecting the type constants, + includes and the union for the babl classes. When adding a new + class this is the only installed header file that requires + modification. + + * babl/babl-class.h: Move the class type enums to the new file. + + * babl/babl.h: Include babl-classes.h instead of each class on its + own, and move the Babl union to the new file. + + * babl/Makefile.am: Add the new file. + +2009-01-18 Sven Neumann + + * babl/babl-component.h + * babl/babl-conversion.h + * babl/babl-extension.h + * babl/babl-format.h + * babl/babl-model.h + * babl/babl-type.h: allow to disable the defines that were added + for backward compatibility by definining BABL_DISABLE_DEPRECATED. + + * babl/babl-image.h: removed trailing whitespace. + +2009-01-17 Martin Nordholts + + Add #define babl_foo babl_foo_from_name macros, that should fix + most builds that broke due to the below refactoring. + + * babl/babl-component.h + * babl/babl-conversion.h + * babl/babl-extension.h + * babl/babl-format.h + * babl/babl-model.h + * babl/babl-type.h + +2009-01-17 Martin Nordholts + + s/babl_image/babl_image_new/ + + * babl/babl-fish-reference.c + * babl/babl-image.c + * babl/babl-image.h + +2009-01-17 Martin Nordholts + + s/babl_foo_init/babl_foo_class_init/ + s/babl_foo_destroy/babl_foo_class_destroy/ + s/babl_foo_each/babl_foo_class_for_each/ + s/babl_foo/babl_foo_from_name/ + s/babl_foo_id/babl_foo_from_id/ + + * babl/babl-class.h + * babl/babl-conversion.c + * babl/babl-core.c + * babl/babl-fish-path.c + * babl/babl-fish-reference.c + * babl/babl-fish-stats.c + * babl/babl-fish.c + * babl/babl-format.c + * babl/babl-image.c + * babl/babl-internal.h + * babl/babl-introspect.c + * babl/babl-model.c + * babl/babl-sampling.c + * babl/babl-sanity.c + * babl/babl-type.c + * babl/babl.c + * babl/base/formats.c + * babl/base/model-gray.c + * babl/base/model-rgb.c + * babl/base/model-ycbcr.c + * babl/base/type-float.c + * babl/base/type-u16.c + * babl/base/type-u32.c + * babl/base/type-u8.c + * extensions/CIE-Lab.c + * extensions/frequency.c + * extensions/gegl-fixups.c + * extensions/gggl-lies.c + * extensions/gggl.c + * extensions/gimp-8bit.c + * extensions/naive-CMYK.c + * extensions/sse-fixups.c + * tests/babl-html-dump.c + * tests/babl_fish_path_fitness.c + * tests/conversions.c + * tests/formats.c + * tests/grayscale_to_rgb.c + * tests/models.c + * tests/rgb_to_bgr.c + * tests/rgb_to_ycbcr.c + * tests/types.c + +2009-01-17 Martin Nordholts + + * babl/babl-class.h: Remove babl_name() and babl_introspect() + which slipped in here. + +2009-01-17 Martin Nordholts + + * babl/babl.h: Don't #include + + * babl/base/formats.c + * babl/base/model-gray.c + * babl/base/model-rgb.c + * extensions/gegl-fixups.c + * extensions/sse-fixups.c: #include + +2009-01-17 Martin Nordholts + + Make babl.h look clean. + + * babl/babl-introspect.h: New installed header for babl_name() and + babl_introspect(). + + * babl/babl.h: Include it. + + * babl/Makefile.am: Add it. + +2009-01-17 Martin Nordholts + + * babl/babl-internal.h: Formating. + +2009-01-17 Martin Nordholts + + * babl/babl-class.h: New installed header file containing class + and typesystem definitions and types. + + * babl/babl.h: Include it. + + * babl/Makefile.am: Add it. + +2009-01-17 Martin Nordholts + + * babl/babl.h: Move up forward declaration of BablList. + + * babl/babl-list.h: Completely rely on that declaration. + +2009-01-17 Martin Nordholts + + * babl/babl.h: Don't have BABL_ALPHA_THRESHOLD public yet. + + * babl/base/util.h: Put it here for now instead. + +2009-01-17 Martin Nordholts + + Instead of having BABL_CLASS() plus variants and making the macros + expand to different things depending on if they are used in a + header or a .c file, have two versions: BABL_CLASS_DECLARE() and + BABL_CLASS_IMPLEMENT(). This enables further refactorisation of + the babl.h header. + + * babl/babl.h: Do the name changes and remove the unpleasant + #undefs at the bottom. + + * babl/babl-internal.h: Do the name changes. + + * babl/babl-component.[ch] + * babl/babl-conversion.[ch] + * babl/babl-extension.[ch] + * babl/babl-fish.[ch] + * babl/babl-format.[ch] + * babl/babl-image.h + * babl/babl-model.[ch] + * babl/babl-sampling.h + * babl/babl-type.[ch]: Adjust to changes. + +2009-01-17 Martin Nordholts + + Don't redeclare functions declared with the BABL_CLASS() or + BABL_NAMED_CLASS() macros. + + * babl/babl-component.h + * babl/babl-conversion.h + * babl/babl-extension.h + * babl/babl-fish.h + * babl/babl-format.h + * babl/babl-image.h + * babl/babl-model.h + * babl/babl-sampling.h + * babl/babl-type.h + +2009-01-17 Martin Nordholts + + * babl/babl-main.h: New installed file with babl_init() and + babl_destroy() declarations. + + * babl/babl.h: Include it. + + * babl/Makefile.am: Add it. + +2009-01-17 Martin Nordholts + + * babl/babl-macros.h: New installed header file that contains + portability macros. + + * babl/babl.h: Include it and don't define portability macros + here. + + * babl/Makefile.am: Add it. + +2009-01-15 Martin Nordholts + + * babl/babl.h: Make BablClassType an int again, it doesn't make + sense as an enum as the set of class types is not a natural + predefined set. + +2009-01-14 Martin Nordholts + + * babl/babl.h: Make BablClassType an enum instead of an unsigned + int contaning enum values. + +2009-01-14 Martin Nordholts + + * babl/babl.h: Use a lowercase 'a' in 0xbab100. + +2009-01-14 Martin Nordholts + + * babl/babl.h: Don't document forward declarations and move them + down a bit to make them less eminent. + +2009-01-14 Martin Nordholts + + * babl/babl.h + * babl/babl-internal.h: Remove BABL_HARD_MAX_PATH_LENGTH from + here, it's only for internal use. + + * babl/babl-fish-path.c: #define BABL_HARD_MAX_PATH_LENGTH locally + here. + +2009-01-14 Martin Nordholts + + * babl/babl.h (BABL_ALPHA_THRESHOLD): Instead of an arbitrary + threshold, use one hundredth of the channel intensity resolution + when using 16 bit integers i.e. 0.01 / (2^16 - 1). + +2008-12-08 Martin Nordholts + + * babl/babl-internal.h (babl_assert): Don't just eek when an + assertion fails, also say exactly what failed. + +2008-11-16 Øyvind Kolås + + * babl/babl-fish-stats.c: (legal_error), (each_conv): show in red the + conversions that are worse than the current BABL_TOLERANCE instead of + the earlier arbitrary 0.01. + +2008-11-16 Martin Nordholts + + * babl/babl-fish-path.c: Use the default babl tolerance level if + BABL_TOLERANCE is the empty string so that we don't get a + tolerance level of 0.0 in that case. + +2008-11-16 Martin Nordholts + + * babl/babl.h: Add #define BABL_ALPHA_THRESHOLD which is the alpha + threshold used in the reference implementation for + un-pre-multiplication of color data. + + * babl/base/model-rgb.c + * babl/base/model-gray.c + * extensions/gegl-fixups.c: Use the define, a consistent alpha + threshold improves accurucy of conversions. + +2008-11-16 Martin Nordholts + + * extensions/gegl-fixups.c (conv_rgbAF_sdl32) + * babl/base/model-gray.c (premultiplied_to_non_premultiplied): + Make un-pre-multiplication with close-to-zero alpha values result + in complete black instead of a bit brigher than black. + +2008-11-08 Øyvind Kolås + + * extensions/gegl-fixups.c: (conv_rgbAF_lrgba8): use the lookup tables + to speed up the conversion 8still error of 0.002677 though). + +2008-11-06 Øyvind Kolås + + * extensions/gegl-fixups.c: (conv_rgbAF_rgbaF), + (conv_rgbAF_lrgba8): make all components 0.0 when alpha < 0.00001. + +2008-11-04 Øyvind Kolås + + * extensions/gegl-fixups.c: (conv_rgbAF_rgbaF), + (conv_rgbAF_lrgba8), (init): added some more missing conversions. + +2008-11-04 Øyvind Kolås + + * extensions/gegl-fixups.c: (conv_rgbaF_rgbAF), (init): added missing, + needed conversion. + +2008-10-01 Øyvind Kolås + + * COPYING.LESSER: renamed to .. + * COPYING: + +2008-07-09 Sven Neumann + + * babl/base/Makefile.am: `:='-style assignments are not portable + +2008-07-04 Sven Neumann + + * extensions/Makefile.am: also use AM_CPPFLAGS and CPPFLAGS for + building sse-fixups. + +2008-07-01 Øyvind Kolås + + * babl/babl-cpuaccel.c: added typedef size_t gsize to the set of + gtypes lifted from glib. spotted by Marianne Gagnon. + +2008-07-01 Øyvind Kolås + + * extensions/Makefile.am: applied patch from dmacks at netspace.org + cleaning up some of the build system. + +2008-06-28 Zhang Junbo + + * extensions/frequency.c: changed RrRiG... back to RrGrBrArRiGiBiAi. + +2008-06-27 Zhang Junbo + + * extensions/frequency.c: some work on frequency_to_rgba. + +2008-06-27 Zhang Junbo + + * extensions/frequency.c: implemented frequency_to_rgba. + +2008-06-22 Zhang Junbo + + * extensions/frequency.c: changed RrGrBr... into RrRiGrGiBrBiArAi. + +2008-06-22 Zhang Junbo + + * extensions/frequency.c: added the format "frequency double". + +2008-06-16 Sam Hocevar + + * Makefile.am: ensure that the "w3m must be available" message is + properly displayed: dist-hook is only called after builddir is filled. + +2008-06-13 Øyvind Kolås + + * extensions/frequency.c: added dummy model "frequency" and dummy + format "frequency float" to be used purely for creating, storing, + accessing but not converting to and from normal tristimulus spaces. + can be used by GeglBuffer to create frequency domain buffers that + are processed in a similar manner to normal buffers. + +2008-06-12 Øyvind Kolås + + * configure.ac: post release increment of version to 0.0.23 + =========================== 0.0.22 released ============================= -2008-02-27 Øyvind Kolås +2008-06-12 Øyvind Kolås * configure.ac: incremented version. diff --git a/INSTALL b/INSTALL index 393214b..ffd064d 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -babl 0.0.22 +babl 0.1.0 Dynamic; any to any, pixel format conversion library. @@ -12,10 +12,10 @@ From a released version the following is the expected method of installation (or a variation on this theme): ------------------------------------------------------------ - foo$ wget ftp://ftp.gtk.org/pub/babl/0.0/babl-0.0.22.tar.bz2 - foo$ tar jxf babl-0.0.22.tar.gz - foo$ cd babl-0.0.22 - foo/babl-0.0.22$ ./configure && make && sudo make install + foo$ wget ftp://ftp.gtk.org/pub/babl/0.0/babl-0.1.0.tar.bz2 + foo$ tar jxf babl-0.1.0.tar.gz + foo$ cd babl-0.1.0 + foo/babl-0.1.0$ ./configure && make && sudo make install ------------------------------------------------------------ diff --git a/Makefile.am b/Makefile.am index 4e16bcb..7a39f34 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,7 +15,6 @@ EXTRA_DIST = \ $(built_dist_files) \ AUTHORS \ COPYING \ - COPYING.LESSER \ INSTALL \ NEWS \ TODO \ @@ -31,12 +30,10 @@ DISTCLEANFILES = \ if HAVE_W3M -dist-check-w3m: - README: all docs/index.html $(W3M) -cols 72 -dump docs/index.html > $@ else -dist-check-w3m: +README: @echo "*** w3m must be available in order to make dist" @false endif @@ -51,4 +48,3 @@ distclean-local: rm -f $(BUILT_EXTRA_DIST); \ fi -dist-hook: dist-check-w3m diff --git a/Makefile.in b/Makefile.in index 1dcd31a..eb88285 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = . am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -36,20 +32,19 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/INSTALL.in \ $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/babl.pc.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure AUTHORS COPYING COPYING.LESSER \ - ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \ - install-sh ltmain.sh missing -subdir = . + $(top_srcdir)/configure AUTHORS COPYING ChangeLog NEWS TODO \ + config.guess config.sub depcomp install-sh ltmain.sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ - configure.lineno configure.status.lineno + configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = babl.pc INSTALL @@ -57,10 +52,11 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -70,6 +66,8 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkgconfigdir)" pkgconfigDATA_INSTALL = $(INSTALL_DATA) DATA = $(pkgconfig_DATA) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -86,8 +84,6 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -106,8 +102,6 @@ BABL_MINOR_VERSION = @BABL_MINOR_VERSION@ BABL_REAL_VERSION = @BABL_REAL_VERSION@ BABL_RELEASE = @BABL_RELEASE@ BABL_UNSTABLE = @BABL_UNSTABLE@ -BABL_UNSTABLE_FALSE = @BABL_UNSTABLE_FALSE@ -BABL_UNSTABLE_TRUE = @BABL_UNSTABLE_TRUE@ BABL_VERSION = @BABL_VERSION@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -124,7 +118,6 @@ DEPDIR = @DEPDIR@ DIR_SEP = @DIR_SEP@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ -DYNAMICLIB = @DYNAMICLIB@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -134,11 +127,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ -HAVE_INKSCAPE_FALSE = @HAVE_INKSCAPE_FALSE@ -HAVE_INKSCAPE_TRUE = @HAVE_INKSCAPE_TRUE@ -HAVE_W3M_FALSE = @HAVE_W3M_FALSE@ -HAVE_W3M_TRUE = @HAVE_W3M_TRUE@ -INKSCAPE = @INKSCAPE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -150,18 +139,13 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MATH_LIB = @MATH_LIB@ +MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_UNIX_FALSE = @OS_UNIX_FALSE@ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -170,9 +154,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEP = @PATH_SEP@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +RSVG = @RSVG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -183,13 +166,13 @@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ WEBSITE_LOCATION = @WEBSITE_LOCATION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -201,6 +184,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -228,8 +212,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ AUTOMAKE_OPTIONS = foreign dist-bzip2 SUBDIRS = \ babl \ @@ -244,7 +232,6 @@ EXTRA_DIST = \ $(built_dist_files) \ AUTHORS \ COPYING \ - COPYING.LESSER \ INSTALL \ NEWS \ TODO \ @@ -297,7 +284,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) config.h: stamp-h1 @if test ! -f $@; then \ rm -f stamp-h1; \ - $(MAKE) stamp-h1; \ + $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ else :; fi stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @@ -323,10 +310,9 @@ clean-libtool: distclean-libtool: -rm -f libtool -uninstall-info-am: install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)" + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -373,8 +359,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -418,8 +403,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -444,8 +429,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -455,13 +440,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -476,24 +460,22 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) - mkdir $(distdir) - $(mkdir_p) $(distdir)/. $(distdir)/babl $(distdir)/docs - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -507,7 +489,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -515,17 +497,16 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ done - $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$(top_distdir)" distdir="$(distdir)" \ - dist-hook -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ - ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ || chmod -R a+r $(distdir) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz @@ -534,6 +515,10 @@ dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) +dist-lzma: distdir + tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -561,6 +546,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.lzma*) \ + unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -600,7 +587,7 @@ distcheck: dist $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ - sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}' + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: @cd $(distuninstallcheck_dir) \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ @@ -625,7 +612,7 @@ all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(pkgconfigdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -674,12 +661,20 @@ info-am: install-data-am: install-pkgconfigDATA +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -700,35 +695,34 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am uninstall-pkgconfigDATA - -uninstall-info: uninstall-info-recursive - -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \ - check-am clean clean-generic clean-libtool clean-recursive \ - ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-local distclean-recursive distclean-tags \ - distcleancheck distdir distuninstallcheck dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-pkgconfigDATA \ - install-strip installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am \ - uninstall-pkgconfigDATA +uninstall-am: uninstall-pkgconfigDATA + +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip + +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am am--refresh check check-am clean clean-generic \ + clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ + dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-libtool \ + distclean-local distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pkgconfigDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-pkgconfigDATA .PHONY: snapshot -@HAVE_W3M_TRUE@dist-check-w3m: - @HAVE_W3M_TRUE@README: all docs/index.html @HAVE_W3M_TRUE@ $(W3M) -cols 72 -dump docs/index.html > $@ -@HAVE_W3M_FALSE@dist-check-w3m: +@HAVE_W3M_FALSE@README: @HAVE_W3M_FALSE@ @echo "*** w3m must be available in order to make dist" @HAVE_W3M_FALSE@ @false @@ -741,8 +735,6 @@ distclean-local: if test $(srcdir) = .; then :; else \ rm -f $(BUILT_EXTRA_DIST); \ fi - -dist-hook: dist-check-w3m # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/NEWS b/NEWS index 87978a0..d2a7518 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,13 @@ the news section both in the README and the webpage. --> +2009-05-20 babl-0.1.0
+Support for RGBA representation in the frequency domain, +un-pre-multiply close-to-zero alpha values to complete black instead +of slightly brighter than black, add a BABL_ALPHA_THRESHOLD constant +to the API, do a complete overhaul of the babl API and do some +changes to increase portability of the library. +
2008-06-12 babl-0.0.22
Speed improvements due to: coalesced hashing, early bail out upon creation of duplicate formats, caching of non existing paths. Large amounts of the core has diff --git a/README b/README index 1a5e304..bbca197 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Babl-0.0.22 +Babl-0.1.0 Contents @@ -48,16 +48,22 @@ Download The latest versioned development version of babl can be found in ftp:// ftp.gtk.org/pub/babl/. -Babl development happens in GNOME Subversion in the babl module. It can -be browsed online and checked out with: +Babl uses git. The main repository is hosted by GNOME. It can be +browsed online and cloned with: -svn co http://svn.gnome.org/svn/babl/trunk/ babl +git clone git://git.gnome.org/babl The following is a list of the major changes that have gone into each babl release. If there are significant improvements to babl when a GEGL release is done a babl release is most often put out just prior to the GEGL release. +2009-05-20 babl-0.1.0 + Support for RGBA representation in the frequency domain, + un-pre-multiply close-to-zero alpha values to complete black + instead of slightly brighter than black, add a BABL_ALPHA_THRESHOLD + constant to the API, do a complete overhaul of the babl API and do + some changes to increase portability of the library. 2008-06-12 babl-0.0.22 Speed improvements due to: coalesced hashing, early bail out upon creation of duplicate formats, caching of non existing paths. Large @@ -67,7 +73,7 @@ GEGL release. Builds on OSX Check <0.0 and >1.0 values conversions for accuracy as well. -For more news see the current ChangeLog in subversion. +For more news see git log. Documentation @@ -332,6 +338,15 @@ components Cr A +CMYK + +components + + cyan + magenta + yellow + key + CIE Lab components @@ -349,15 +364,6 @@ components CIE b A -CMYK - -components - - cyan - magenta - yellow - key - Pixel formats RGBA double @@ -938,6 +944,32 @@ components u8 R' u8 PAD +CMYK double + +bytes/pixel + 32 +model + CMYK +components + + double cyan + double magenta + double yellow + double key + +CMYK float + +bytes/pixel + 16 +model + CMYK +components + + float cyan + float yellow + float magenta + float key + CIE Lab float bytes/pixel @@ -1012,32 +1044,6 @@ components double CIE b double A -CMYK double - -bytes/pixel - 32 -model - CMYK -components - - double cyan - double magenta - double yellow - double key - -CMYK float - -bytes/pixel - 16 -model - CMYK -components - - float cyan - float yellow - float magenta - float key - Shortcut Coverage The diagram shown below visualizes the coverage of current shortcut @@ -1046,68 +1052,68 @@ height of the bar indicates the number of conversions steps needed in a chain of conversions. A DHTML version is also available. - ·· ·▁····· ▁ ▂ ▁ ▁ ··· ── 0 RGBA double -· ▁ ▁▂▁▁▁▁▁ · ▁ ▂ ▂ ▁▁▁ ── 1 R'G'B'A double -·▁ ▁▂▁▁▁▁▁ ▂ ▂ ▂ ▁▁▁ ── 2 R'aG'aB'aA double -▁▂▂ ···▂▂▂▃▂ ▁ ▁ ·· ▁· ▂ ▁ ▂▂▂ ── 3 R'G'B' u8 -▁▁▂· ·▁▂▂▂▃▂ · ▁ ▁ ▁▁ ▁ ▂▂▂ ── 4 R'G'B'A u8 -·▁▁ ·▁▁▁▁▁ ▂ ▃ · · ▁▁▁ ── 5 RGBA float -▁▂▂ · ▂▂▂▂▂ ▃ ▁· ▂ ▁ ▂▂▂ ── 6 RGB float -·▁▁ ▁▂ ▁▁▁▁ ▂ ▃ ▂ ▂ ▁▁▁ ── 7 Y'aA double -·▁▁ ▁▂▁ ▁▁▁ ▂ ▃ ▃ ▂▂ ▃ ▂ ▁▁▁ ── 8 Y double -·▁▁ ▁▂▁▁ ▁▁ ▂ ▃ ▂ ▂ ▁▁▁ ── 9 YA double -·▁▁ ▁▂▁▁▁ ▁ ▂ ▃ ▃ ▂▂ ▃ ▂ ▁▁▁ ──10 Y'CbCr double -·▁▁ ▁▂▁▁▁▁ ▂ ▃ ▂ ▂ ▁▁▁ ──11 Y'CbCrA double + ·· ·▁····· ▁ ▂ ▁▁ ▁ · ··── 0 RGBA double + ▁ ▁▂▁▁▁▁▁ · ▁ ▂▂ ▂ ▁ ▁▁── 1 R'G'B'A double +· ▁▂▁▁▁▁▁ ▂ ▃ ▂ ▂ ▁ ▁▁── 2 R'aG'aB'aA double +▁▂ ···▂▂▂▂▂ ▁ ▁ ·· ▁· ▂ ▁ ▂ ▃▂── 3 R'G'B' u8 +▁▁▂ ·▁▂▂▂▂▂ · ▁ ▁ ▁▁ ▁ ▂ ▂▂── 4 R'G'B'A u8 +·▁▁ ·▁▁▁▁▁ ▂ ▃ ·· · ▁ ▁▁── 5 RGBA float +▁▂▂ ▂▂▂▃▂ ▃ ▁· ▂ ▁ ▂ ▂▂── 6 RGB float +·▁▁ ▁ ▁ ▁▁ ▂ ▃ ▂▂ ▂ ▁ ▁▁── 7 Y'aA double +·▁▁ ▁▂ ▁▁▁ ▂ ▃ ▃ ▂▂ ▃ ▂ ▁ ▁▁── 8 Y double +·▁▁ ▁▂▁ ▁▁ ▂ ▃ ▂▂ ▂ ▁ ▁▁── 9 YA double +·▁▁ ▁▂▁▁ ▁ ▂ ▃ ▃ ▂▂ ▃ ▂ ▁ ▁▁──10 Y'CbCr double +·▁▁ ▁▂▁▁▁ ▂ ▃ ▂▂ ▂ ▁ ▁▁──11 Y'CbCrA double ──12 Y'CbCr u8 -▁·▂ ▂▃▂▂▂▂▂ · ▃ ▃ ▂▂▂ ──13 R'G'B'A float -▂▁▃ ▃ ▃▃▃▃▃ · ▁ ▁ ▃▃▃ ──14 R'G'B'A u16 - ──15 R'aG'aB'aA float - · ──16 R'aG'aB'aA u16 - · ──17 R'aG'aB'aA u8 -▂▁▃ ▃ ▃▃▃▃▃ · · ▃▃▃ ──18 R'G'B' float -▃▂ ▁ ▁ · ──19 R'G'B' u16 +▁·▂ ▂▃▂▂▂▂▂ · ▃▃ ▃ ▂ ▂▂──13 R'G'B'A float + ▁▃ ▃ ▃▃▃▃▃ ▁ ▁ ▃ ▃──14 R'G'B'A u16 + ▃▃──15 R'aG'aB'aA float +▃▂ ▁ ▂ ──16 R'aG'aB'aA u16 +▃▂ ▁ · ▂ ──17 R'aG'aB'aA u8 +▂▁▃ ▃ ▃▃▃▃▃ · · ▃ ▃▃──18 R'G'B' float +▃▃ ▂ ▁ ──19 R'G'B' u16 ▁ · ▁ ▁ ·· ▂ ▁ ──20 Y'A float - ▂ ▁ · ▂ · ▁ ▁ · ──21 Y'aA float - ▂ ▁ ▁ · ·· ──22 Y' float -▃▂ ▁ ▂ ▂ ·▁▁ ▃ ▂ ──23 Y'A u16 + ▂ ▁ · ▂ ▁ ▁ · ──21 Y'aA float + ▂ ▁ ▁ · · ──22 Y' float + ▂ ▁ ▂ ▂ ·▁ ▃ ▂ ──23 Y'A u16 ▃ ▂ ▁ ▃ ▁·▂ ▁ ──24 Y'aA u16 ▃ ▂ ▂ ▁ ▁▁· ──25 Y' u16 -▁▂▃ ·▁▂▂▂▃▂ ▁ ▂ ▂ ·▁▁ ▃ ▂ ▁▂ ▁·▁▁ ▃▂▂ ──26 Y'A u8 +▁▂▂ ·▂▂▂▂▂▂ ▁ ▂ ▂ ·▁▁ ▃ ▂ ▁▁ ▁·▁▁ ▂ ▃▂──26 Y'A u8 ▃ ▂ ▁ ▃ ▁·▂ · ──27 Y'aA u8 -▁▃▂ ·▁▂▂▂▂▂ ▂ ▂ ▁ ▁▁· ▁▂ ▂ ▁▁▁· ▂▂▂ ──28 Y' u8 +▁▃▂ ·▁▂▂▂▂▂ ▂ ▂ ▁ ▁▁· ▁▂ ▂ ▁▁▁· ▂ ▂▂──28 Y' u8 ▃▂ ▁ ▁ · ──29 Y'CbCr float -▂▁▃ ▃ ▃▃▃▃ · ▁ ▃▃▃ ──30 Y'CbCrA float -▁▂▂ ·▁▂▂▂▂▂ ▃ ▁▁ ▁ ▂▂▂ ──31 RGBA u16 -▁▂▂ ·▁▂▂▂▂▂ ▃ ▁ · ▂▂▂ ──32 RGBA u8 - ──33 RaGaBaA float - · ──34 RaGaBaA u16 - · ──35 RaGaBaA u8 -▂▃▃ ▁·▃▃▃▃▃ ▂▁ ▃ ▂ ▃▃▃ ──36 RGB u16 -▁▂▂ ··▃▂▂▂▂ ▃ ·▁ · ▂▂▂ ──37 RGB u8 -▁▂▂ ·▁▂▂▂▂▂ ▃ ▁▁ ▁ ·· ▂▂▂ ──38 YA float - ▃ ▂· ▂ ▃▃▃ ──39 YaA float -▂▃▃ ▁·▃▃▃▃▃ ▂▁ ▃ ▂·· ▃▃▃ ──40 Y float -▂▃▃ ▁▂▃▃▃▃▃ ▂▂ ▂·▁▁ ▃▃▃ ──41 YA u16 - ▃▁ ▃ · ──42 YaA u16 -▃ ▂▁ ▃▃ ▃▁▂· ──43 Y u16 -▁▂▂ ·▁▂▂▂▃▃ ▁▂ ▁·▁▁ ▂▂▂ ──44 YA u8 +▂▁▃ ▃ ▃ ▃▃ · ▁ ▃ ▃▃──30 Y'CbCrA float + ▂▂ ·▁▂▂▂▂▂ ▃ ▁▁ ▁ ▂ ▂▂──31 RGBA u16 +▁▂▂ ·▁▂▂▂▂▂ ▃ ▁ · ▂ ▂▂──32 RGBA u8 +▁▂▂ ·▁▂▂▂▂▂ ▃ ▂ ▂ ▂▂──33 RaGaBaA float +▂▃▃ ▁▂▃▃▃▃▃ ▂ ▂ ▃ ▃▃──34 RaGaBaA u16 +▂▃▃ ▁▂▃▃▃▃▃ · ▃ ▃▃──35 RaGaBaA u8 +▃▃▃ ▁·▃▃▃▃▃ ▂▁ ▂ ▃ ▃▃──36 RGB u16 +▁▃▂ ··▃▂▂▂▃ ▃ ·▁ · ▂ ▂▂──37 RGB u8 +▁▂▂ ·▁▂▂ ▂▂ ▃ ▁▁ ·· ▂ ▂▂──38 YA float +▂▃▃ ▁▂▃▃▃▃▃ ▂· ▂ ▃ ▃▃──39 YaA float +▂▃▃ ▁·▃ ▃▃▃ ▂▁ ▃ ▂· ▃ ▃▃──40 Y float +▂▃▃ ▁▂▃▃ ▃▃ ▂▂ ▂·▁ ▃ ▃▃──41 YA u16 +▃ ▂▃ ▃▁ ▃ · ──42 YaA u16 +▃ ▂▁ ▃▂ ▃▁▁· ──43 Y u16 +▁▂▃ ·▁▂▂▂▂▂ ▁▁ ▁·▁▁ ▂ ▂▂──44 YA u8 ▃ ▂▃ ▁ ▁·▂ ──45 YaA u8 -▁▂▂ ·▁▂▂▂▂▂ ▃ ▁▂ ▂ ▁▁▁· ▂▂▂ ──46 Y u8 +▁▂▂ ·▁▂ ▂▂▂ ▃ ▁▂ ▂ ▁▁▁· ▂ ▂▂──46 Y u8 ──47 B'aG'aR'aA u8 ──48 B'aG'aR'aPAD u8 - ──49 CIE Lab float - ──50 CIE Lab alpha float - ──51 CIE Lab u8 - ──52 CIE Lab u16 -·▁▁ ▁▂▁▁▁▁ ▂ ▃ ▃ ▂▂ ▃ ▂ ▁▁ ──53 CIE Lab double -·▁▁ ▁▂▁▁▁▁▁ ▂ ▃ ▂ ▂ ▁ ▁ ──54 CIE Lab alpha double -·▁▁ ▁▂▁▁▁▁▁ ▂ ▃ ▃ ▃▂ ▃ ▂ ▁▁ ──55 CMYK double - ──56 CMYK float +·▁▁ ▁▂▁▁▁▁▁ ▂ ▃ ▃ ▂▂ ▃ ▂ ▁▁──49 CMYK double + ──50 CMYK float + ──51 CIE Lab float + ──52 CIE Lab alpha float + ──53 CIE Lab u8 + ──54 CIE Lab u16 +·▁▁ ▁▂▁▁▁▁▁ ▂ ▃ ▃ ▂▂ ▃ ▂ ▁ ▁──55 CIE Lab double +·▁▁ ▁▂▁▁▁▁▁ ▂ ▃ ▂▂ ▃ ▁ ──56 CIE Lab alpha double ||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ||||||||||11111111112222222222333333333344444444445555555 012345678901234567890123456789012345678901234567890123456 -total length: 1613 -total cost : 978192 +total length: 1788 +total cost : 656285 Environment @@ -1189,5 +1195,17 @@ Mukund Sivaraman muks at mukund.org Sparse fixes and sanity. dmacks at netspace.org Build sanity - -/babl-0.0.22 +Sam Hocevar + Build sanity. +Zhang Junbo + Frequency domain color model. +Martin Nordholts + Optimizations and API overhaul. +Gary V. Vaughan + Multiplatform build support. +Stanislav Brabec + Portability patch. +Hubert Figuiere + C++ friendliness patch. + +/babl-0.1.0 diff --git a/acinclude.m4 b/acinclude.m4 index 3fad630..4ea58bd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -18,3 +18,65 @@ AC_DEFUN([BABL_DETECT_CFLAGS], fi done ]) + + +# BABL_VARIADIC_MACROS +# -------------------- +# check for flavours of variadic macros +AC_DEFUN([BABL_VARIADIC_MACROS], +[AC_BEFORE([$0], [AC_PROG_CXX]) +AC_REQUIRE([AC_PROG_CPP]) +AC_CACHE_CHECK([for GNUC variadic macros], + [babl_cv_prog_gnuc_variadic_macros], + [# gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi + # is passed ISO vararg support is turned off, and there is no work + # around to turn it on, so we unconditionally turn it off. + { echo '#if __GNUC__ == 2 && __GNUC_MINOR__ == 95' + echo ' yes ' + echo '#endif'; } > conftest.c + if ${CPP} conftest.c | grep yes > /dev/null; then + babl_cv_prog_c_variadic_macros=no + babl_cv_prog_cxx_variadic_macros=no + fi + AC_TRY_COMPILE([],[int a(int p1, int p2, int p3); +#define call_a(params...) a(1,params) +call_a(2,3); + ], + babl_cv_prog_gnuc_variadic_macros=yes, + babl_cv_prog_gnuc_variadic_macros=no) +]) +if test x$babl_cv_prog_gnuc_variadic_macros = xyes; then + AC_DEFINE(BABL_GNUC_VARIADIC_MACROS, 1, [Define if the C pre-processor supports GNU style variadic macros]) +fi + +AC_CACHE_CHECK([for ISO C99 variadic macros in C], + [babl_cv_prog_c_variadic_macros], + [AC_TRY_COMPILE([],[int a(int p1, int p2, int p3); +#define call_a(...) a(1,__VA_ARGS__) +call_a(2,3); + ], + babl_cv_prog_c_variadic_macros=yes, + babl_cv_prog_c_variadic_macros=no) +]) +if test x$babl_cv_prog_c_variadic_macros = xyes ; then + AC_DEFINE(BABL_ISO_VARIADIC_MACROS, 1, [Define if the C pre-processor supports variadic macros]) +fi + +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_CACHE_CHECK([for ISO C99 variadic macros in C++], + [babl_cv_prog_cxx_variadic_macros], + [AC_LANG_PUSH(C++) + AC_TRY_COMPILE([],[int a(int p1, int p2, int p3); +#define call_a(...) a(1,__VA_ARGS__) +call_a(2,3); + ], + babl_cv_prog_cxx_variadic_macros=yes, + babl_cv_prog_cxx_variadic_macros=no) + AC_LANG_POP])], + [# No C++ compiler + babl_cv_prog_cxx_variadic_macros=no]) +if test x$babl_cv_prog_cxx_variadic_macros = xyes ; then + AC_DEFINE(BABL_ISO_CXX_VARIADIC_MACROS, 1, [Define if the C++ pre-processor supports variadic macros]) +fi +]) + diff --git a/aclocal.m4 b/aclocal.m4 index b4629ed..41b1109 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- +# generated automatically by aclocal 1.10.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,9 +11,17 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(AC_AUTOCONF_VERSION, [2.63],, +[m4_warning([this file was generated for autoconf 2.63. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically `autoreconf'.])]) + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL +# serial 52 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -637,6 +645,7 @@ s390*-*linux*|sparc*-*linux*) esac ;; *64-bit*) + libsuff=64 case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" @@ -1699,11 +1708,13 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -1715,18 +1726,6 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -2508,7 +2507,7 @@ linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -3515,7 +3514,7 @@ case $host_os in ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -5207,7 +5206,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC]) ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -5584,9 +5583,6 @@ ifelse([$1],[CXX],[ cygwin* | mingw*) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ;; - linux* | k*bsd*-gnu) - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - ;; *) _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5795,13 +5791,12 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=no else _LT_AC_TAGVAR(ld_shlibs, $1)=no fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -6232,7 +6227,7 @@ _LT_EOF _LT_AC_TAGVAR(link_all_deplibs, $1)=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -6663,7 +6658,7 @@ AC_SUBST([SED]) AC_MSG_RESULT([$SED]) ]) -# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -6673,14 +6668,31 @@ AC_MSG_RESULT([$SED]) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been # generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"]) +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.10' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.10.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) # AM_SET_CURRENT_AUTOMAKE_VERSION # ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.6])]) +[AM_AUTOMAKE_VERSION([1.10.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- @@ -6737,14 +6749,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 7 +# serial 8 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -6753,8 +6765,10 @@ AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ(2.52)dnl ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE]) -AC_SUBST([$1_FALSE]) +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -6768,15 +6782,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -6804,6 +6817,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl ifelse([$1], CC, [depcc="$CC" am_compiler_list=], [$1], CXX, [depcc="$CXX" am_compiler_list=], [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], [depcc="$$1" am_compiler_list=]) @@ -6869,6 +6883,7 @@ AC_CACHE_CHECK([dependency style of $depcc], depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -6921,7 +6936,8 @@ if test "x$enable_dependency_tracking" != xno; then AMDEPBACKSLASH='\' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -6946,8 +6962,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`AS_DIRNAME("$mf")` else continue @@ -7006,14 +7023,14 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 12 +# serial 13 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -7030,16 +7047,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.58])dnl +[AC_PREREQ([2.60])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi fi # test whether we have cygpath @@ -7059,6 +7080,9 @@ m4_ifval([$2], AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl @@ -7094,6 +7118,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], [_AM_DEPENDENCIES(CXX)], [define([AC_PROG_CXX], defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) ]) @@ -7107,16 +7135,17 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX], # our stamp files there. AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], [# Compute $1's index in $config_headers. +_am_arg=$1 _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $1 | $1:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # @@ -7129,7 +7158,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -7236,14 +7265,14 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -7259,6 +7288,7 @@ AC_SUBST($1)]) # If it does, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" # Use eval to expand $SHELL if eval "$MISSING --run true"; then @@ -7269,7 +7299,7 @@ else fi ]) -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -7277,60 +7307,23 @@ fi # AM_PROG_MKDIR_P # --------------- -# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -# -# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -# created by `make install' are always world readable, even if the -# installer happens to have an overly restrictive umask (e.g. 077). -# This was a mistake. There are at least two reasons why we must not -# use `-m 0755': -# - it causes special bits like SGID to be ignored, -# - it may be too restrictive (some setups expect 775 directories). -# -# Do not use -m 0755 and let people choose whatever they expect by -# setting umask. -# -# We cannot accept any implementation of `mkdir' that recognizes `-p'. -# Some implementations (such as Solaris 8's) are not thread-safe: if a -# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c' -# concurrently, both version can detect that a/ is missing, but only -# one can create it and the other will error out. Consequently we -# restrict ourselves to GNU make (using the --version option ensures -# this.) +# Check for `mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], -[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' - else - mkdir_p='$(install_sh) -d' - fi -fi -AC_SUBST([mkdir_p])]) +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) # Helper functions for option handling. -*- Autoconf -*- @@ -7442,9 +7435,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. diff --git a/babl/Makefile.am b/babl/Makefile.am index 5b35869..f92f757 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -7,60 +7,68 @@ endif SUBDIRS = base c_sources = \ - babl.c \ - babl-core.c \ - babl-db.c \ + babl.c \ babl-component.c \ babl-conversion.c \ + babl-core.c \ + babl-cpuaccel.c \ + babl-db.c \ babl-extension.c \ - babl-fish.c \ + babl-fish-path.c \ + babl-fish-reference.c \ babl-fish-simple.c \ babl-fish-stats.c \ - babl-fish-reference.c \ - babl-fish-path.c \ + babl-fish.c \ babl-format.c \ + babl-hash-table.c \ babl-image.c \ babl-internal.c \ babl-introspect.c \ + babl-list.c \ babl-memory.c \ babl-model.c \ babl-sampling.c \ babl-sanity.c \ babl-type.c \ babl-util.c \ - babl-list.c \ - babl-hash-table.c \ - babl-cpuaccel.c \ babl-version.c -h_sources = \ - babl-db.h \ - babl-ids.h \ - babl-internal.h \ - babl-memory.h \ - babl-util.h \ - babl.h \ - babl-list.h \ - babl-hash-table.h \ - babl-cpuaccel.h - -library_includedir=$(includedir)/babl-$(BABL_API_VERSION)/babl -library_include_HEADERS = \ +h_sources = \ babl.h \ + babl-class.h \ + babl-classes.h \ babl-component.h \ babl-conversion.h \ + babl-cpuaccel.h \ + babl-db.h \ babl-extension.h \ babl-fish.h \ babl-format.h \ + babl-hash-table.h \ + babl-ids.h \ babl-image.h \ + babl-internal.h \ + babl-introspect.h \ + babl-list.h \ + babl-macros.h \ + babl-memory.h \ babl-model.h \ - babl-sampling.h \ - babl-type.h \ - babl-version.h + babl-sampling.h \ + babl-type.h \ + babl-types.h \ + babl-util.h -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base +library_includedir=$(includedir)/babl-$(BABL_API_VERSION)/babl +library_include_HEADERS = \ + babl-macros.h \ + babl-types.h \ + babl-version.h \ + babl.h -AM_CPPFLAGS = -DLIBDIR=\""$(libdir)"\" +AM_CPPFLAGS = \ + -DLIBDIR=\""$(libdir)"\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/babl/base lib_LTLIBRARIES= libbabl-@BABL_API_VERSION@.la libbabl_@BABL_API_VERSION@_la_SOURCES= $(h_sources) $(c_sources) diff --git a/babl/Makefile.in b/babl/Makefile.in index f29cafe..3648f67 100644 --- a/babl/Makefile.in +++ b/babl/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,15 +15,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -62,47 +58,53 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libbabl_@BABL_API_VERSION@_la_DEPENDENCIES = base/libbase.la \ @LTLIBOBJS@ $(am__empty) am__objects_1 = -am__objects_2 = babl.lo babl-core.lo babl-db.lo babl-component.lo \ - babl-conversion.lo babl-extension.lo babl-fish.lo \ - babl-fish-simple.lo babl-fish-stats.lo babl-fish-reference.lo \ - babl-fish-path.lo babl-format.lo babl-image.lo \ - babl-internal.lo babl-introspect.lo babl-memory.lo \ - babl-model.lo babl-sampling.lo babl-sanity.lo babl-type.lo \ - babl-util.lo babl-list.lo babl-hash-table.lo babl-cpuaccel.lo \ +am__objects_2 = babl.lo babl-component.lo babl-conversion.lo \ + babl-core.lo babl-cpuaccel.lo babl-db.lo babl-extension.lo \ + babl-fish-path.lo babl-fish-reference.lo babl-fish-simple.lo \ + babl-fish-stats.lo babl-fish.lo babl-format.lo \ + babl-hash-table.lo babl-image.lo babl-internal.lo \ + babl-introspect.lo babl-list.lo babl-memory.lo babl-model.lo \ + babl-sampling.lo babl-sanity.lo babl-type.lo babl-util.lo \ babl-version.lo am_libbabl_@BABL_API_VERSION@_la_OBJECTS = $(am__objects_1) \ $(am__objects_2) libbabl_@BABL_API_VERSION@_la_OBJECTS = \ $(am_libbabl_@BABL_API_VERSION@_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +libbabl_@BABL_API_VERSION@_la_LINK = $(LIBTOOL) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) \ + $(libbabl_@BABL_API_VERSION@_la_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(libbabl_@BABL_API_VERSION@_la_SOURCES) DIST_SOURCES = $(libbabl_@BABL_API_VERSION@_la_SOURCES) RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive library_includeHEADERS_INSTALL = $(INSTALL_HEADER) HEADERS = $(library_include_HEADERS) +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -121,8 +123,6 @@ BABL_MINOR_VERSION = @BABL_MINOR_VERSION@ BABL_REAL_VERSION = @BABL_REAL_VERSION@ BABL_RELEASE = @BABL_RELEASE@ BABL_UNSTABLE = @BABL_UNSTABLE@ -BABL_UNSTABLE_FALSE = @BABL_UNSTABLE_FALSE@ -BABL_UNSTABLE_TRUE = @BABL_UNSTABLE_TRUE@ BABL_VERSION = @BABL_VERSION@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -139,7 +139,6 @@ DEPDIR = @DEPDIR@ DIR_SEP = @DIR_SEP@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ -DYNAMICLIB = @DYNAMICLIB@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -149,11 +148,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ -HAVE_INKSCAPE_FALSE = @HAVE_INKSCAPE_FALSE@ -HAVE_INKSCAPE_TRUE = @HAVE_INKSCAPE_TRUE@ -HAVE_W3M_FALSE = @HAVE_W3M_FALSE@ -HAVE_W3M_TRUE = @HAVE_W3M_TRUE@ -INKSCAPE = @INKSCAPE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -165,18 +160,13 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MATH_LIB = @MATH_LIB@ +MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_UNIX_FALSE = @OS_UNIX_FALSE@ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -185,9 +175,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEP = @PATH_SEP@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +RSVG = @RSVG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -198,13 +187,13 @@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ WEBSITE_LOCATION = @WEBSITE_LOCATION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -216,6 +205,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -243,64 +233,78 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ @OS_WIN32_TRUE@no_undefined = -no-undefined SUBDIRS = base c_sources = \ - babl.c \ - babl-core.c \ - babl-db.c \ + babl.c \ babl-component.c \ babl-conversion.c \ + babl-core.c \ + babl-cpuaccel.c \ + babl-db.c \ babl-extension.c \ - babl-fish.c \ + babl-fish-path.c \ + babl-fish-reference.c \ babl-fish-simple.c \ babl-fish-stats.c \ - babl-fish-reference.c \ - babl-fish-path.c \ + babl-fish.c \ babl-format.c \ + babl-hash-table.c \ babl-image.c \ babl-internal.c \ babl-introspect.c \ + babl-list.c \ babl-memory.c \ babl-model.c \ babl-sampling.c \ babl-sanity.c \ babl-type.c \ babl-util.c \ - babl-list.c \ - babl-hash-table.c \ - babl-cpuaccel.c \ babl-version.c h_sources = \ - babl-db.h \ - babl-ids.h \ - babl-internal.h \ - babl-memory.h \ - babl-util.h \ - babl.h \ - babl-list.h \ - babl-hash-table.h \ - babl-cpuaccel.h - -library_includedir = $(includedir)/babl-$(BABL_API_VERSION)/babl -library_include_HEADERS = \ babl.h \ + babl-class.h \ + babl-classes.h \ babl-component.h \ babl-conversion.h \ + babl-cpuaccel.h \ + babl-db.h \ babl-extension.h \ babl-fish.h \ babl-format.h \ + babl-hash-table.h \ + babl-ids.h \ babl-image.h \ + babl-internal.h \ + babl-introspect.h \ + babl-list.h \ + babl-macros.h \ + babl-memory.h \ babl-model.h \ - babl-sampling.h \ - babl-type.h \ - babl-version.h + babl-sampling.h \ + babl-type.h \ + babl-types.h \ + babl-util.h + +library_includedir = $(includedir)/babl-$(BABL_API_VERSION)/babl +library_include_HEADERS = \ + babl-macros.h \ + babl-types.h \ + babl-version.h \ + babl.h + +AM_CPPFLAGS = \ + -DLIBDIR=\""$(libdir)"\" \ + -I$(top_srcdir) \ + -I$(top_srcdir)/babl/base -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl/base -AM_CPPFLAGS = -DLIBDIR=\""$(libdir)"\" lib_LTLIBRARIES = libbabl-@BABL_API_VERSION@.la libbabl_@BABL_API_VERSION@_la_SOURCES = $(h_sources) $(c_sources) libbabl_@BABL_API_VERSION@_la_LIBADD = \ @@ -348,21 +352,21 @@ babl-version.h: $(top_builddir)/config.status $(srcdir)/babl-version.h.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)" + test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ if test -f $$p; then \ f=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ - $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \ else :; fi; \ done uninstall-libLTLIBRARIES: @$(NORMAL_UNINSTALL) - @set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ p=$(am__strip_dir) \ - echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ - $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \ done clean-libLTLIBRARIES: @@ -374,7 +378,7 @@ clean-libLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done libbabl-@BABL_API_VERSION@.la: $(libbabl_@BABL_API_VERSION@_la_OBJECTS) $(libbabl_@BABL_API_VERSION@_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libbabl_@BABL_API_VERSION@_la_LDFLAGS) $(libbabl_@BABL_API_VERSION@_la_OBJECTS) $(libbabl_@BABL_API_VERSION@_la_LIBADD) $(LIBS) + $(libbabl_@BABL_API_VERSION@_la_LINK) -rpath $(libdir) $(libbabl_@BABL_API_VERSION@_la_OBJECTS) $(libbabl_@BABL_API_VERSION@_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -410,22 +414,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/babl.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -435,13 +439,9 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: install-library_includeHEADERS: $(library_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(library_includedir)" || $(mkdir_p) "$(DESTDIR)$(library_includedir)" + test -z "$(library_includedir)" || $(MKDIR_P) "$(DESTDIR)$(library_includedir)" @list='$(library_include_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ @@ -488,8 +488,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -533,8 +532,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -559,8 +558,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -570,13 +569,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -590,22 +588,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -619,7 +616,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -627,6 +624,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -637,7 +636,7 @@ all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: installdirs-recursive installdirs-am: for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(library_includedir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive install-exec: install-exec-recursive @@ -672,7 +671,7 @@ distclean: distclean-recursive -rm -rf $(DEPDIR) ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-recursive @@ -686,12 +685,20 @@ info-am: install-data-am: install-library_includeHEADERS +install-dvi: install-dvi-recursive + install-exec-am: install-libLTLIBRARIES +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -712,27 +719,28 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \ +uninstall-am: uninstall-libLTLIBRARIES \ uninstall-library_includeHEADERS -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libLTLIBRARIES clean-libtool \ - clean-recursive ctags ctags-recursive distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-recursive distclean-tags distdir dvi dvi-am html \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic \ + clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ install-info-am install-libLTLIBRARIES \ - install-library_includeHEADERS install-man install-strip \ + install-library_includeHEADERS install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-info-am uninstall-libLTLIBRARIES \ - uninstall-library_includeHEADERS + uninstall-libLTLIBRARIES uninstall-library_includeHEADERS # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/babl/babl-class.h b/babl/babl-class.h new file mode 100644 index 0000000..534c476 --- /dev/null +++ b/babl/babl-class.h @@ -0,0 +1,69 @@ +/* babl - dynamically extendable universal pixel conversion library. + * Copyright (C) 2005-2008, Øyvind KolÃ¥s and others. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * . + */ + +#ifndef _BABL_CLASS_H +#define _BABL_CLASS_H + +#include "babl.h" + + +typedef struct _BablList BablList; + +typedef int BablClassType; + +typedef int (*BablEachFunction) (Babl *entry, + void *data); + +/* All Classes in babl have common functionality like the ability + * to be iterated over, common functionality is defined through these + * macros. + */ +#define BABL_CLASS_DECLARE(klass) \ + \ +Babl * babl_##klass##_from_id (int id); \ +void babl_##klass##_class_init (void); \ +void babl_##klass##_class_destroy (void); \ +void babl_##klass##_class_for_each (BablEachFunction each_fun, \ + void *user_data) + +/* If a class is declared as a "named class" it means it is a class + * that has a specific name connected to it, that also allows defining + * a new instance. These classes share common functionality with the + * non_name classes but have two extra methods, the means to lookup by + * name, as well as to create new named objects that later can be + * looked up. These methods are babl_klass() babl_klass_new() but they + * are declared outside of this macro. + */ +#define BABL_NAMED_CLASS_DECLARE(klass) \ +BABL_CLASS_DECLARE (klass) + + +/* common header for any item inserted into database, the actual + * implementation of babl-instance is in babl-internal + */ +typedef struct +{ + BablClassType class_type; + int id; /*< a numerical id, look at 'babl-ids.h' for the reserved + ones */ + void *creator; + char *name; /*< the name this type exists under */ +} BablInstance; + + +#endif diff --git a/babl/babl-classes.h b/babl/babl-classes.h new file mode 100644 index 0000000..eeaa262 --- /dev/null +++ b/babl/babl-classes.h @@ -0,0 +1,91 @@ +/* babl - dynamically extendable universal pixel conversion library. + * Copyright (C) 2005-2008, Øyvind KolÃ¥s and others. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * . + */ + +#ifndef _BABL_CLASSES_H +#define _BABL_CLASSES_H + +#include "babl-class.h" + +/* magic number used at the start of all babl objects, used to do + * differentiation in polymorphic functions. (as well as manual type + * check assertions). + */ +#define BABL_MAGIC 0xbab100 + +/* class types */ +enum { + BABL_INSTANCE = BABL_MAGIC, + BABL_TYPE, + BABL_TYPE_INTEGER, + BABL_TYPE_FLOAT, + BABL_SAMPLING, + BABL_COMPONENT, + BABL_MODEL, + BABL_FORMAT, + + BABL_CONVERSION, + BABL_CONVERSION_LINEAR, + BABL_CONVERSION_PLANE, + BABL_CONVERSION_PLANAR, + + BABL_FISH, + BABL_FISH_REFERENCE, + BABL_FISH_SIMPLE, + BABL_FISH_PATH, + BABL_IMAGE, + + BABL_EXTENSION, + + BABL_SKY +}; + + +#include "babl-type.h" +#include "babl-sampling.h" +#include "babl-component.h" +#include "babl-model.h" +#include "babl-format.h" +#include "babl-image.h" +#include "babl-conversion.h" +#include "babl-fish.h" +#include "babl-extension.h" + + +/* This union can be used for convenient access to any field without + * the need to case if the variable already is of the type Babl* + */ +typedef union _Babl +{ + BablClassType class_type; + BablInstance instance; + BablType type; + BablSampling sampling; + BablComponent component; + BablModel model; + BablFormat format; + BablConversion conversion; + BablImage image; + BablFish fish; + BablFishReference fish_reference; + BablFishSimple fish_simple; + BablFishPath fish_path; + BablExtension extension; +} _Babl; + + +#endif diff --git a/babl/babl-component.c b/babl/babl-component.c index 4c84bba..301e64d 100644 --- a/babl/babl-component.c +++ b/babl/babl-component.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-internal.h" #include "babl-db.h" #include @@ -127,4 +128,4 @@ babl_component_new (void *first_arg, return babl; } -BABL_CLASS (component) +BABL_CLASS_IMPLEMENT (component) diff --git a/babl/babl-component.h b/babl/babl-component.h index fa8090b..df9d719 100644 --- a/babl/babl-component.h +++ b/babl/babl-component.h @@ -16,24 +16,14 @@ * . */ -#ifndef _BABL_H -#error this file is only to be included by babl.h -#endif +#ifndef _BABL_COMPONENT_H +#define _BABL_COMPONENT_H /****************************************************************/ /* BablComponent */ -BABL_NAMED_CLASS (component); -/* - * Babl * babl_component_new (const char *name, - * NULL); - */ -Babl *babl_component_id (int id); -void babl_component_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_component (const char *name); -Babl * babl_component_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; +BABL_NAMED_CLASS_DECLARE (component); + typedef struct { @@ -42,3 +32,5 @@ typedef struct int chroma; int alpha; } BablComponent; + +#endif diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c index 7c028b5..e08b2e6 100644 --- a/babl/babl-conversion.c +++ b/babl/babl-conversion.c @@ -17,6 +17,7 @@ */ +#include "config.h" #include #include #include @@ -114,19 +115,19 @@ conversion_new (const char *name, { Babl *src_format = NULL; Babl *dst_format = NULL; - if (BABL (babl->conversion.source) == babl_model_id (BABL_RGBA)) + if (BABL (babl->conversion.source) == babl_model_from_id (BABL_RGBA)) { - src_format = babl_format_id (BABL_RGBA_DOUBLE); + src_format = babl_format_from_id (BABL_RGBA_DOUBLE); dst_format = babl_format_with_model_as_type ( BABL (babl->conversion.destination), - babl_type_id (BABL_DOUBLE)); + babl_type_from_id (BABL_DOUBLE)); } - else if (BABL (babl->conversion.destination) == babl_model_id (BABL_RGBA)) + else if (BABL (babl->conversion.destination) == babl_model_from_id (BABL_RGBA)) { src_format = babl_format_with_model_as_type ( BABL (babl->conversion.source), - babl_type_id (BABL_DOUBLE)); - dst_format = babl_format_id (BABL_RGBA_DOUBLE); + babl_type_from_id (BABL_DOUBLE)); + dst_format = babl_format_from_id (BABL_RGBA_DOUBLE); } else { @@ -555,4 +556,4 @@ babl_conversion_error (BablConversion *conversion) return error; } -BABL_CLASS (conversion) +BABL_CLASS_IMPLEMENT (conversion) diff --git a/babl/babl-conversion.h b/babl/babl-conversion.h index 4f697b1..d231b64 100644 --- a/babl/babl-conversion.h +++ b/babl/babl-conversion.h @@ -16,31 +16,14 @@ * . */ -#ifndef _BABL_H -#error this file is only to be included by babl.h -#endif +#ifndef _BABL_CONVERSION_H +#define _BABL_CONVERSION_H + +BABL_NAMED_CLASS_DECLARE (conversion); + +Babl * babl_conversion (const char *name); -/****************************************************************/ -/* BablConversion */ -BABL_NAMED_CLASS (conversion); -/* - * Babl * babl_conversion_new (, - * <"linear"|"planar">, BablConversionFunc conv_func, - * NULL); - */ -Babl *babl_conversion_id (int id); -void babl_conversion_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_conversion (const char *name); -Babl * babl_conversion_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; -/* Type and Format */ -typedef long (*BablFuncLinear) (char *src, - char *dst, - long n); /* Signature of functions registered for reference type * conversions, @@ -51,14 +34,6 @@ typedef long (*BablFuncPlane) (char *src, int dst_pitch, long n); -/* TypePlanar,ModelPlanar and FormatPlanar */ -typedef long (*BablFuncPlanar) (int src_bands, - char *src[], - int src_pitch[], - int dst_bands, - char *dst[], - int dst_pitch[], - long n); typedef struct BablConversion { @@ -76,3 +51,5 @@ BablConversion { int processings; long pixels; } BablConversion; + +#endif diff --git a/babl/babl-core.c b/babl/babl-core.c index ff734e4..f66b191 100644 --- a/babl/babl-core.c +++ b/babl/babl-core.c @@ -15,6 +15,7 @@ * . */ +#include "config.h" #include #include "babl-internal.h" #include "babl-ids.h" @@ -126,41 +127,41 @@ babl_core_init (void) babl_model_new ( "id", BABL_RGBA, - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( "id", BABL_RGBA_DOUBLE, - babl_model_id (BABL_RGBA), - babl_type_id (BABL_DOUBLE), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_DOUBLE), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); /* babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), "planar", copy_strip_1, NULL ); */ babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_DOUBLE), "plane", convert_double_double, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), "linear", rgba_to_rgba, NULL ); diff --git a/babl/babl-cpuaccel.c b/babl/babl-cpuaccel.c index 2f45cfd..a4202f2 100644 --- a/babl/babl-cpuaccel.c +++ b/babl/babl-cpuaccel.c @@ -28,7 +28,6 @@ */ #include "config.h" - #include #include #include @@ -39,6 +38,7 @@ typedef unsigned int gboolean; typedef unsigned int guint32; typedef int gint; typedef char gchar; +typedef size_t gsize; #define TRUE 1 #define FALSE 0 #define G_GNUC_CONST diff --git a/babl/babl-cpuaccel.h b/babl/babl-cpuaccel.h index 0fd4c4b..c95af91 100644 --- a/babl/babl-cpuaccel.h +++ b/babl/babl-cpuaccel.h @@ -24,7 +24,7 @@ typedef enum BABL_CPU_ACCEL_NONE = 0x0, /* x86 accelerations */ - BABL_CPU_ACCEL_X86_MMX = 0x80000000, + BABL_CPU_ACCEL_X86_MMX = 0x01000000, BABL_CPU_ACCEL_X86_3DNOW = 0x40000000, BABL_CPU_ACCEL_X86_MMXEXT = 0x20000000, BABL_CPU_ACCEL_X86_SSE = 0x10000000, diff --git a/babl/babl-db.c b/babl/babl-db.c index 0b10daf..74413d8 100644 --- a/babl/babl-db.c +++ b/babl/babl-db.c @@ -23,6 +23,7 @@ #define _BABL_DB_C +#include "config.h" #include #include "babl-internal.h" diff --git a/babl/babl-db.h b/babl/babl-db.h index 7aa4f37..3d76ca2 100644 --- a/babl/babl-db.h +++ b/babl/babl-db.h @@ -16,8 +16,8 @@ * . */ -#ifndef _DB_H -#define _DB_H +#ifndef _BABL_DB_H +#define _BABL_DB_H #ifndef _BABL_H #error babl-db.h is only to be included after babl.h diff --git a/babl/babl-extension.c b/babl/babl-extension.c index 921f7f4..3ba28ae 100644 --- a/babl/babl-extension.c +++ b/babl/babl-extension.c @@ -18,9 +18,7 @@ #define BABL_DYNAMIC_EXTENSIONS -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #define BABL_PATH LIBDIR BABL_DIR_SEPARATOR BABL_LIBRARY @@ -135,8 +133,31 @@ destroy_hook (void) #include #ifdef HAVE_DLFCN_H + #include #define HLIB void * + +#elif HAVE_DL_H + +#include +#include +#if !defined(DYNAMIC_PATH) +# define DYNAMIC_PATH 0 +#endif +#if !defined(BIND_RESTRICTED) +# define BIND_RESTRICTED 0 +#endif +#define RTLD_NOW (BIND_IMMEDIATE|BIND_NONFATAL|DYNAMIC_PATH) +#define HLIB shl_t +#define dlopen(path, flags) shl_load (path, flags, 0L) +#define dlclose(handle) shl_unload (handle) +#define dlerror() strerror (errno) +static void *dlsym (HLIB handle, const char *name) { + void *address = 0; + shl_findsym(&handle, name, TYPE_UNDEFINED, &address); + return address; +} + #endif #ifndef RTLD_NOW @@ -357,4 +378,4 @@ each_babl_extension_destroy (Babl *babl, return 0; /* continue iterating */ } -BABL_CLASS (extension) +BABL_CLASS_IMPLEMENT (extension) diff --git a/babl/babl-extension.h b/babl/babl-extension.h index 152ab7f..cd7f831 100644 --- a/babl/babl-extension.h +++ b/babl/babl-extension.h @@ -16,22 +16,19 @@ * . */ -#ifndef _BABL_H -#error this file is only to be included by babl.h -#endif +#ifndef _BABL_EXTENSION_H +#define _BABL_EXTENSION_H + /****************************************************************/ /* BablExtension */ -BABL_NAMED_CLASS (extension); +BABL_NAMED_CLASS_DECLARE (extension); /* * BablExtension objects are only used internally in babl. */ -Babl *babl_extension_id (int id); -void babl_extension_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_extension (const char *name); -Babl * babl_extension_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; + +Babl * babl_extension (const char *name); + typedef struct { @@ -39,3 +36,5 @@ typedef struct void *dl_handle; void (*destroy) (void); } BablExtension; + +#endif diff --git a/babl/babl-fish-path.c b/babl/babl-fish-path.c index d2cd4e7..b69cf63 100644 --- a/babl/babl-fish-path.c +++ b/babl/babl-fish-path.c @@ -16,11 +16,13 @@ * . */ +#include "config.h" #include #include "babl-internal.h" -#define BABL_LEGAL_ERROR 0.000001 -#define BABL_MAX_COST_VALUE 2000000 +#define BABL_LEGAL_ERROR 0.000001 +#define BABL_MAX_COST_VALUE 2000000 +#define BABL_HARD_MAX_PATH_LENGTH 8 static void init_path_instrumentation (Babl *fmt_source, @@ -68,7 +70,7 @@ static double legal_error (void) return error; env = getenv ("BABL_TOLERANCE"); - if (env) + if (env && env[0] != '\0') error = atof (env); else error = BABL_LEGAL_ERROR; @@ -371,7 +373,7 @@ test_create (void) return test; } -// FishPath instrumentation +/* FishPath instrumentation */ static Babl *fmt_rgba_double = NULL; static double *test = NULL; diff --git a/babl/babl-fish-reference.c b/babl/babl-fish-reference.c index bee30f1..0b1cc27 100644 --- a/babl/babl-fish-reference.c +++ b/babl/babl-fish-reference.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-internal.h" static Babl * @@ -101,19 +102,19 @@ convert_to_double (BablFormat *source_fmt, BablImage *src_img; BablImage *dst_img; - src_img = (BablImage *) babl_image ( - babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL); - dst_img = (BablImage *) babl_image ( - babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL); + src_img = (BablImage *) babl_image_new ( + babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL); + dst_img = (BablImage *) babl_image_new ( + babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL); - dst_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE); + dst_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE); dst_img->pitch[0] = (dst_img->type[0]->bits / 8) * source_fmt->model->components; dst_img->stride[0] = 0; src_img->data[0] = source_buf; - src_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE); + src_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE); src_img->pitch[0] = source_fmt->bytes_per_pixel; src_img->stride[0] = 0; @@ -158,17 +159,17 @@ convert_from_double (BablFormat *destination_fmt, BablImage *src_img; BablImage *dst_img; - src_img = (BablImage *) babl_image ( - babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL); - dst_img = (BablImage *) babl_image ( - babl_component_id (BABL_LUMINANCE), NULL, 1, 0, NULL); + src_img = (BablImage *) babl_image_new ( + babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL); + dst_img = (BablImage *) babl_image_new ( + babl_component_from_id (BABL_LUMINANCE), NULL, 1, 0, NULL); - src_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE); + src_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE); src_img->pitch[0] = (src_img->type[0]->bits / 8) * destination_fmt->model->components; src_img->stride[0] = 0; dst_img->data[0] = destination_buf; - dst_img->type[0] = (BablType *) babl_type_id (BABL_DOUBLE); + dst_img->type[0] = (BablType *) babl_type_from_id (BABL_DOUBLE); dst_img->pitch[0] = destination_fmt->bytes_per_pixel; dst_img->stride[0] = 0; @@ -272,7 +273,7 @@ babl_fish_reference_process (Babl *babl, source_image = babl_image_from_linear ( source_double_buf, BABL (BABL ((babl->fish.source))->format.model)); rgba_image = babl_image_from_linear ( - rgba_double_buf, babl_model_id (BABL_RGBA)); + rgba_double_buf, babl_model_from_id (BABL_RGBA)); destination_image = babl_image_from_linear ( destination_double_buf, BABL (BABL ((babl->fish.destination))->format.model)); @@ -288,7 +289,7 @@ babl_fish_reference_process (Babl *babl, Babl *conv = assert_conversion_find ( BABL (babl->fish.source)->format.model, - babl_model_id (BABL_RGBA) + babl_model_from_id (BABL_RGBA) ); if (conv->class_type == BABL_CONVERSION_PLANAR) { @@ -310,7 +311,7 @@ babl_fish_reference_process (Babl *babl, { Babl *conv = assert_conversion_find ( - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), BABL (babl->fish.destination)->format.model); if (conv->class_type == BABL_CONVERSION_PLANAR) { diff --git a/babl/babl-fish-simple.c b/babl/babl-fish-simple.c index ecd6d0d..36908aa 100644 --- a/babl/babl-fish-simple.c +++ b/babl/babl-fish-simple.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-internal.h" static char * diff --git a/babl/babl-fish-stats.c b/babl/babl-fish-stats.c index 9f938c3..5348303 100644 --- a/babl/babl-fish-stats.c +++ b/babl/babl-fish-stats.c @@ -16,15 +16,18 @@ * . */ +#include "config.h" #include "babl-internal.h" static FILE *output_file = NULL; static int qux = 0; static char *utf8_bar[] = { " ", "·", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" }; -//static char *utf8_bar[]= {"!","▁","▃","▅","▇","█","!","!","!"}; -//static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", }; -//static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"}; +/* +static char *utf8_bar[]= {"!","▁","▃","▅","▇","█","!","!","!"}; +static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", }; +static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"}; +*/ static int table_destination_each (Babl *babl, @@ -33,7 +36,8 @@ table_destination_each (Babl *babl, Babl *source = userdata; Babl *destination = babl; - if ((qux++) % babl_formats_count () == qux / babl_formats_count ()) + qux++; + if (qux % babl_formats_count () == qux / babl_formats_count ()) fprintf (output_file, " "); else { @@ -196,12 +200,30 @@ table_source_each (Babl *babl, } fprintf (output_file, ""); - babl_format_each (table_destination_each, babl); + babl_format_class_for_each (table_destination_each, babl); fprintf (output_file, "\n"); source_no++; return 0; } +/* copied from babl-fish-path.c */ +#define BABL_LEGAL_ERROR 0.000001 +static double legal_error (void) +{ + static double error = 0.0; + const char *env; + + if (error != 0.0) + return error; + + env = getenv ("BABL_TOLERANCE"); + if (env && env[0] != '\0') + error = atof (env); + else + error = BABL_LEGAL_ERROR; + return error; +} + static int each_conv (Babl *babl, void *data) @@ -214,7 +236,7 @@ each_conv (Babl *babl, error = babl_conversion_error (&babl->conversion); cost = babl_conversion_cost (&babl->conversion); - if (error > 0.01) + if (error > legal_error ()) { fprintf (output_file, "
%s
", babl->instance.name); fprintf (output_file, "
"); @@ -234,7 +256,7 @@ static void conversions (void) { fprintf (output_file, "

Conversions

\n"); - babl_conversion_each (each_conv, NULL); + babl_conversion_class_for_each (each_conv, NULL); fprintf (output_file, "
\n"); } @@ -362,7 +384,7 @@ babl_fish_stats (FILE *file) fprintf (output_file, "\n"); - babl_format_each (table_source_each, NULL); + babl_format_class_for_each (table_source_each, NULL); fprintf (output_file, "
Source formatDestination formats
"); diff --git a/babl/babl-fish.c b/babl/babl-fish.c index 8d7c37e..0ab048c 100644 --- a/babl/babl-fish.c +++ b/babl/babl-fish.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-internal.h" #include #include @@ -192,8 +193,14 @@ babl_fish (const void *source, (Babl *) NULL, (Babl *) NULL, 0, - source_format, - destination_format}; + (Babl *) NULL, + (Babl *) NULL}; + + /* some vendor compilers can't compile non-constant elements of + * compound struct initializers + */ + ffish.source = source_format; + ffish.destination = destination_format; id_htable = (babl_fish_db ())->id_hash; hashval = babl_hash_by_int (id_htable, babl_fish_get_id (source_format, destination_format)); @@ -335,4 +342,4 @@ each_babl_fish_destroy (Babl *babl, return 0; /* continue iterating */ } -BABL_CLASS_MINIMAL (fish); +BABL_CLASS_MINIMAL_IMPLEMENT (fish); diff --git a/babl/babl-fish.h b/babl/babl-fish.h index 56b7ab5..1592329 100644 --- a/babl/babl-fish.h +++ b/babl/babl-fish.h @@ -16,31 +16,13 @@ * . */ -#ifndef _BABL_H -#error this file is only to be included by babl.h -#endif +#ifndef _BABL_FISH_H +#define _BABL_FISH_H + /****************************************************************/ /* BablFish */ -BABL_CLASS (fish); -/* Create a babl fish capable of converting from source_format to - * destination_format, source and destination can be - * either strings with the names of the formats or BablFormat objects. - */ -Babl * babl_fish (const void *source_format, - const void *destination_format); - -/** Process n pixels from source to destination using babl_fish, - * returns number of pixels converted. - */ -long babl_process (Babl *babl_fish, - void *source, - void *destination, - long n); - -Babl *babl_fish_id (int id); -void babl_fish_each (BablEachFunction each_fun, - void *user_data); +BABL_CLASS_DECLARE (fish); /* BablFish, common base class for various fishes. */ @@ -105,3 +87,5 @@ typedef struct { BablFish fish; } BablFishReference; + +#endif diff --git a/babl/babl-format.c b/babl/babl-format.c index bc080c6..f3fe36b 100644 --- a/babl/babl-format.c +++ b/babl/babl-format.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include #include @@ -194,7 +195,7 @@ babl_format_new (void *first_arg, BablType *type [BABL_MAX_COMPONENTS]; BablSampling *current_sampling = (BablSampling *) babl_sampling (1, 1); - BablType *current_type = (BablType *) babl_type_id (BABL_DOUBLE); + BablType *current_type = (BablType *) babl_type_from_id (BABL_DOUBLE); char *name = NULL; void *arg = first_arg; @@ -328,6 +329,58 @@ babl_formats_count (void) return babl_db_count (db); } +int +babl_format_has_alpha (const Babl *format) +{ + int n = babl_format_get_n_components (format); + int i; + + for (i = 0; i < n; i++) + { + if (format->format.component[i]->alpha) + { + return 1; + } + } + + return 0; +} + +int +babl_format_get_bytes_per_pixel (const Babl *format) +{ + if (format->class_type == BABL_FORMAT) + { + return format->format.bytes_per_pixel; + } + + return 0; +} + +int +babl_format_get_n_components (const Babl *format) +{ + if (format->class_type == BABL_FORMAT) + { + return format->format.components; + } + + return 0; +} + +Babl * +babl_format_get_type (const Babl *format, + int component_index) +{ + if (format->class_type == BABL_FORMAT && + component_index >= 0 && + component_index < format->format.components) + { + return (Babl *)format->format.type[component_index]; + } + + return NULL; +} Babl * babl_format_with_model_as_type (Babl *model, @@ -436,4 +489,4 @@ babl_format_loss (Babl *babl) return loss; } -BABL_CLASS (format) +BABL_CLASS_IMPLEMENT (format) diff --git a/babl/babl-format.h b/babl/babl-format.h index 4903e24..f130bcd 100644 --- a/babl/babl-format.h +++ b/babl/babl-format.h @@ -16,36 +16,10 @@ * . */ -#ifndef _BABL_H -#error this file is only to be included by babl.h -#endif +#ifndef _BABL_FORMAT_H +#define _BABL_FORMAT_H -/****************************************************************/ -/* BablFormat */ -BABL_NAMED_CLASS (format); -/* - * Babl * babl_format_new (["name", const char *name,] - * BablModel *model, - * [BablType *type,] - * [BablSampling, *sampling,] - * BablComponent *component1, - * [[BablType *type,] - * [BablSampling *sampling,] - * BablComponent *componentN, - * ...] - * ["planar",] - * NULL); - * - * Provided BablType and|or BablSampling is valid for the following - * components as well. If no name is provided a (long) descriptive - * name is used. - */ -Babl *babl_format_id (int id); -void babl_format_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_format (const char *name); -Babl * babl_format_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; +BABL_NAMED_CLASS_DECLARE (format); typedef struct { @@ -66,3 +40,5 @@ typedef struct int visited; /* for convenience in code while searching for conversion paths */ } BablFormat; + +#endif diff --git a/babl/babl-hash-table.c b/babl/babl-hash-table.c index c48d48d..a468d4a 100644 --- a/babl/babl-hash-table.c +++ b/babl/babl-hash-table.c @@ -20,6 +20,7 @@ * Copyright (C) 2008, Jan Heller */ +#include "config.h" #include "babl-internal.h" #define BABL_HASH_TABLE_INITIAL_MASK 0x7F diff --git a/babl/babl-ids.h b/babl/babl-ids.h index 66df882..f0f6c61 100644 --- a/babl/babl-ids.h +++ b/babl/babl-ids.h @@ -106,7 +106,7 @@ enum { BABL_YCBCR420, BABL_FORMAT_LAST_INTERNAL, - BABL_PIXEL_USER_BASE, + BABL_PIXEL_USER_BASE }; diff --git a/babl/babl-image.c b/babl/babl-image.c index 9d9b9d3..f54c87e 100644 --- a/babl/babl-image.c +++ b/babl/babl-image.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include @@ -135,7 +136,7 @@ babl_image_from_linear (char *buffer, for (i = 0; i < components; i++) { sampling[i] = (BablSampling *) babl_sampling (1, 1); - type[i] = (BablType *) babl_type_id (BABL_DOUBLE); + type[i] = (BablType *) babl_type_from_id (BABL_DOUBLE); pitch[i] = calc_pitch; stride[i] = 0; data[i] = buffer + offset; @@ -156,8 +157,8 @@ babl_image_from_linear (char *buffer, } Babl * -babl_image (void *first, - ...) +babl_image_new (void *first, + ...) { va_list varg; Babl *babl; @@ -226,13 +227,13 @@ babl_image (void *first, } void -babl_image_destroy (void) +babl_image_class_destroy (void) { /* nothing to do */ } void -babl_image_init (void) +babl_image_class_init (void) { /* nothing to do */ } diff --git a/babl/babl-image.h b/babl/babl-image.h index 353144e..2b7a2a8 100644 --- a/babl/babl-image.h +++ b/babl/babl-image.h @@ -16,36 +16,34 @@ * . */ -#ifndef _BABL_H -#error this file is only to be included by babl.h -#endif +#ifndef _BABL_IMAGE_H +#define _BABL_IMAGE_H + /****************************************************************/ /* BablImage */ -BABL_CLASS (image); +BABL_CLASS_DECLARE (image); /* * Babl images can be used for planar buffers instead of linear buffers for * babl_process(), BablImages are still experimental, for now BablImages can be * passed to babl_process, two different babl_process() functions will be * needed for this since the polymorphism cannot be trusted to work on linear * buffers that originate outside babl's control. - * - * Babl * babl_image (BablComponent *component1, - * void *data, - * int pitch, - * int stride, - * [BablComponent *component1, - * void *data, - * int pitch, - * int stride, - * ...] - * NULL); + * + * Babl * babl_image_new (BablComponent *component1, + * void *data, + * int pitch, + * int stride, + * [BablComponent *component1, + * void *data, + * int pitch, + * int stride, + * ...] + * NULL); */ -Babl * babl_image (void *first_component, +Babl * babl_image_new (void *first_component, ...) BABL_ARG_NULL_TERMINATED; -Babl *babl_image_id (int id); -void babl_image_each (BablEachFunction each_fun, - void *user_data); + typedef struct { BablInstance instance; @@ -59,3 +57,5 @@ typedef struct int *pitch; int *stride; } BablImage; + +#endif diff --git a/babl/babl-internal.c b/babl/babl-internal.c index 8de4ce5..596e268 100644 --- a/babl/babl-internal.c +++ b/babl/babl-internal.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include "babl-internal.h" @@ -132,7 +133,7 @@ babl_internal_destroy (void) const char * -babl_name (const Babl *babl) +babl_get_name (const Babl *babl) { babl_assert (BABL_IS_BABL (babl)); return babl->instance.name; diff --git a/babl/babl-internal.h b/babl/babl-internal.h index d2e6f82..884b971 100644 --- a/babl/babl-internal.h +++ b/babl/babl-internal.h @@ -19,12 +19,15 @@ #ifndef _BABL_INTERNAL_H #define _BABL_INTERNAL_H +#ifndef BABL_LIBRARY +#error "config.h must be included prior to babl-internal.h" +#endif + #ifdef _BABL_H #error babl-internal.h included after babl.h #endif #define BABL_MAX_COMPONENTS 32 -#define BABL_HARD_MAX_PATH_LENGTH 8 #define BABL_CONVERSIONS 5 #include @@ -37,8 +40,9 @@ #include "babl.h" #define _BABL_INTERNAL_H -#include "config.h" - +#include "babl-class.h" +#include "babl-classes.h" +#include "babl-introspect.h" #include "babl-list.h" #include "babl-hash-table.h" #include "babl-db.h" @@ -60,7 +64,7 @@ -Babl * babl_conversion_find (const void *source, +Babl * babl_conversion_find (const void *source, const void *destination); double babl_conversion_error (BablConversion *conversion); long babl_conversion_cost (BablConversion *conversion); @@ -110,10 +114,10 @@ void babl_die (void); int babl_sanity (void); void babl_core_init (void); -Babl * babl_format_with_model_as_type (Babl *model, - Babl *type); -int babl_formats_count (void); /* should maybe be templated? */ -int babl_type_is_symmetric (Babl *babl); +Babl * babl_format_with_model_as_type (Babl *model, + Babl *type); +int babl_formats_count (void); /* should maybe be templated? */ +int babl_type_is_symmetric (Babl *babl); /* FIXME: nasty,. including the symbol even in files where it is * not needed,. and a dummy function to use it in those cases @@ -158,21 +162,70 @@ real_babl_log (const char *file, hack_hack (); } +/* Provide a string identifying the current function, non-concatenatable */ +#ifndef G_STRFUNC +#if defined (__GNUC__) +# define G_STRFUNC ((const char*) (__PRETTY_FUNCTION__)) +#elif defined (G_HAVE_ISO_VARARGS) +# define G_STRFUNC ((const char*) (__func__)) +#else +# define G_STRFUNC ((const char*) ("???")) +#endif +#endif + +#if defined(__cplusplus) && defined(BABL_ISO_CXX_VARIADIC_MACROS) +# define BABL_ISO_VARIADIC_MACROS 1 +#endif + +#if defined(BABL_ISO_VARIADIC_MACROS) + +#define babl_log(...) \ + real_babl_log(__FILE__, __LINE__, G_STRFUNC, __VA_ARGS__) + +#define babl_fatal(...) do{ \ + real_babl_log(__FILE__, __LINE__, G_STRFUNC, __VA_ARGS__); \ + babl_die();} \ +while(0) + +#elif defined(BABL_GNUC_VARIADIC_MACROS) + #define babl_log(args...) \ - real_babl_log(__FILE__, __LINE__, __func__, args) + real_babl_log(__FILE__, __LINE__, G_STRFUNC, args) #define babl_fatal(args...) do{ \ - real_babl_log(__FILE__, __LINE__, __func__, args);\ + real_babl_log(__FILE__, __LINE__, G_STRFUNC, args); \ babl_die();} \ while(0) +#else + +static inline void +babl_log (const char *format, ...) +{ + va_list args; + va_start (args, format); + real_babl_log (__FILE__, __LINE__, G_STRFUNC, format, args); + va_end (args); +} +static inline void +babl_fatal (const char *format, ...) +{ + va_list args; + va_start (args, format); + real_babl_log (__FILE__, __LINE__, G_STRFUNC, format, args); + va_end (args); + babl_die(); +} + +#endif + -#define babl_assert(expr) do{ \ - if(!(expr)) \ - { \ - babl_fatal("Eeeeek"); \ - assert(expr); \ - } \ +#define babl_assert(expr) do{ \ + if(!(expr)) \ + { \ + real_babl_log(__FILE__, __LINE__, G_STRFUNC, "Eeeeek! Assertion failed: `" #expr "`"); \ + assert(expr); \ + } \ }while(0) /***** LOGGER (end)**/ @@ -210,9 +263,9 @@ void babl_internal_destroy (void); * to be kept in sync with the C files. */ -#define BABL_CLASS_MINIMAL(klass) \ +#define BABL_CLASS_MINIMAL_IMPLEMENT(klass) \ void \ -babl_##klass##_init (void) \ +babl_##klass##_class_init (void) \ { \ BABL_PRE_INIT_HOOK; \ if (!db) \ @@ -221,7 +274,7 @@ babl_##klass##_init (void) \ } \ \ void \ -babl_##klass##_destroy (void) \ +babl_##klass##_class_destroy (void) \ { \ BABL_DESTROY_PRE_HOOK; \ babl_db_each (db,each_babl_##klass##_destroy, NULL); \ @@ -230,14 +283,14 @@ babl_##klass##_destroy (void) \ } \ \ void \ -babl_##klass##_each (BablEachFunction each_fun, \ - void *user_data) \ +babl_##klass##_class_for_each (BablEachFunction each_fun, \ + void *user_data) \ { \ babl_db_each (db, each_fun, user_data); \ } \ -#define BABL_CLASS(klass) \ -BABL_CLASS_MINIMAL(klass) \ +#define BABL_CLASS_IMPLEMENT(klass) \ +BABL_CLASS_MINIMAL_IMPLEMENT(klass) \ \ Babl * \ babl_##klass (const char *name) \ @@ -246,25 +299,25 @@ babl_##klass (const char *name) \ \ if (babl_hmpf_on_name_lookups) \ { \ - babl_log ("%s(\"%s\"): hmpf!", __func__, name); \ + babl_log ("%s(\"%s\"): hmpf!", G_STRFUNC, name); \ } \ babl = babl_db_exist_by_name (db, name); \ \ if (!babl) \ { \ - babl_fatal ("%s(\"%s\"): not found", __func__, name); \ + babl_fatal ("%s(\"%s\"): not found", G_STRFUNC, name); \ } \ return babl; \ } \ \ Babl * \ -babl_##klass##_id (int id) \ +babl_##klass##_from_id (int id) \ { \ Babl *babl; \ babl = babl_db_exist_by_id (db, id); \ if (!babl) \ { \ - babl_fatal ("%s(%i): not found", __func__, id); \ + babl_fatal ("%s(%i): not found", G_STRFUNC, id); \ } \ return babl; \ } diff --git a/babl/babl-introspect.c b/babl/babl-introspect.c index 9db8bb2..34cf9b4 100644 --- a/babl/babl-introspect.c +++ b/babl/babl-introspect.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-internal.h" /* for babl_log */ #define BABL_LOG @@ -49,28 +50,28 @@ babl_introspect (Babl *babl) babl_log (""); babl_log ("Data Types:"); - babl_type_each (each_introspect, NULL); + babl_type_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("Sampling (chroma subsampling) factors:"); - babl_sampling_each (each_introspect, NULL); + babl_sampling_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("Components:"); - babl_component_each (each_introspect, NULL); + babl_component_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("Models (of components):"); - babl_model_each (each_introspect, NULL); + babl_model_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("Pixel formats:"); - babl_format_each (each_introspect, NULL); + babl_format_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("conversions:"); - babl_conversion_each (each_introspect, NULL); + babl_conversion_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("extensions:"); - babl_extension_each (each_introspect, NULL); + babl_extension_class_for_each (each_introspect, NULL); babl_log (""); babl_log ("fishes"); - babl_fish_each (each_introspect, NULL); + babl_fish_class_for_each (each_introspect, NULL); babl_log (""); babl_set_extender (extender_backup); diff --git a/babl/babl-introspect.h b/babl/babl-introspect.h new file mode 100644 index 0000000..6e32a2a --- /dev/null +++ b/babl/babl-introspect.h @@ -0,0 +1,26 @@ +/* babl - dynamically extendable universal pixel conversion library. + * Copyright (C) 2005-2008, Øyvind KolÃ¥s and others. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * . + */ + +#ifndef _BABL_INTROSPECT_H +#define _BABL_INTROSPECT_H + + +void babl_introspect (Babl *babl); /* introspect a given BablObject */ + + +#endif diff --git a/babl/babl-list.c b/babl/babl-list.c index 8e539af..898e8c5 100644 --- a/babl/babl-list.c +++ b/babl/babl-list.c @@ -20,6 +20,7 @@ * Copyright (C) 2008, Jan Heller */ +#include "config.h" #include "babl-internal.h" #define BABL_LIST_INITIAL_SIZE 0x7F diff --git a/babl/babl-list.h b/babl/babl-list.h index 7b35dea..d38eb6d 100644 --- a/babl/babl-list.h +++ b/babl/babl-list.h @@ -20,20 +20,15 @@ #define _BABL_LIST_H #ifndef _BABL_H -/* babl.h contains forward declaration - * typedef struct _BablList BablList; - */ #error babl-list.h is only to be included after babl.h #endif - -typedef struct _BablList +struct _BablList { int count; int size; Babl **items; -} _BablList; - +}; BablList * babl_list_init (void); diff --git a/babl/babl-macros.h b/babl/babl-macros.h new file mode 100644 index 0000000..8de6864 --- /dev/null +++ b/babl/babl-macros.h @@ -0,0 +1,33 @@ +/* babl - dynamically extendable universal pixel conversion library. + * Copyright (C) 2005-2008, Øyvind KolÃ¥s and others. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * . + */ + +#ifndef _BABL_MACROS_H +#define _BABL_MACROS_H + +#ifndef BABL_INSIDE_BABL_H +#error "babl-version.h must not be included directly, include babl.h instead." +#endif + + +#if __GNUC__ >= 4 +#define BABL_ARG_NULL_TERMINATED __attribute__((__sentinel__)) +#else +#define BABL_ARG_NULL_TERMINATED +#endif + +#endif diff --git a/babl/babl-memory.c b/babl/babl-memory.c index adaece4..ea6e65d 100644 --- a/babl/babl-memory.c +++ b/babl/babl-memory.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include #include diff --git a/babl/babl-model.c b/babl/babl-model.c index 5fd4908..c78f1d8 100644 --- a/babl/babl-model.c +++ b/babl/babl-model.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include #include @@ -327,4 +328,4 @@ babl_model_is_symmetric (Babl *babl) return symmetric; } -BABL_CLASS (model) +BABL_CLASS_IMPLEMENT (model) diff --git a/babl/babl-model.h b/babl/babl-model.h index 8307d0e..617c91c 100644 --- a/babl/babl-model.h +++ b/babl/babl-model.h @@ -16,29 +16,10 @@ * . */ -#ifndef _BABL_H -#error this file is only to be included by babl.h -#endif +#ifndef _BABL_MODEL_H +#define _BABL_MODEL_H -/****************************************************************/ -/* BablModel */ -BABL_NAMED_CLASS (model); -/* - * Babl * babl_model_new (["name", const char *name,] - * BablComponent *component1, - * [BablComponent *componentN, ...] - * NULL); - * - * If no name is provided a name is generated by concatenating the - * name of all the involved components. - * - */ -Babl *babl_model_id (int id); -void babl_model_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_model (const char *name); -Babl * babl_model_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; +BABL_NAMED_CLASS_DECLARE (model); typedef struct { @@ -46,5 +27,8 @@ typedef struct BablList *from_list; int components; BablComponent **component; - BablType **type; /*< must be doubles, used here for convenience in code */ + BablType **type; /*< must be doubles, + used here for convenience in code */ } BablModel; + +#endif diff --git a/babl/babl-sampling.c b/babl/babl-sampling.c index 3f73142..d3fa637 100644 --- a/babl/babl-sampling.c +++ b/babl/babl-sampling.c @@ -21,6 +21,7 @@ #define VERTICAL_MIN 1 #define VERTICAL_MAX 4 +#include "config.h" #include "babl-internal.h" static BablSampling sampling_db[(HORIZONTAL_MAX - HORIZONTAL_MIN + 1) * @@ -52,8 +53,8 @@ each_babl_sampling_destroy (Babl *babl, } void -babl_sampling_each (BablEachFunction each_fun, - void *user_data) +babl_sampling_class_for_each (BablEachFunction each_fun, + void *user_data) { int horizontal; int vertical; @@ -69,13 +70,13 @@ babl_sampling_each (BablEachFunction each_fun, void -babl_sampling_destroy (void) +babl_sampling_class_destroy (void) { - babl_sampling_each (each_babl_sampling_destroy, NULL); + babl_sampling_class_for_each (each_babl_sampling_destroy, NULL); } void -babl_sampling_init (void) +babl_sampling_class_init (void) { int horizontal; int vertical; diff --git a/babl/babl-sampling.h b/babl/babl-sampling.h index 6aeee0b..869e3de 100644 --- a/babl/babl-sampling.h +++ b/babl/babl-sampling.h @@ -16,19 +16,11 @@ * . */ -#ifndef _BABL_H -#error this file is only to be included by babl.h -#endif +#ifndef _BABL_SAMPLING_H +#define _BABL_SAMPLING_H + +BABL_CLASS_DECLARE (sampling); -/****************************************************************/ -/* BablSampling */ -BABL_CLASS (sampling); -/**/ -Babl * babl_sampling (int horizontal, - int vertical); -Babl *babl_sampling_id (int id); -void babl_sampling_each (BablEachFunction each_fun, - void *user_data); typedef struct { BablInstance instance; @@ -37,3 +29,5 @@ typedef struct int vertical; char name[4]; } BablSampling; + +#endif diff --git a/babl/babl-sanity.c b/babl/babl-sanity.c index 7d5058f..5eb74b4 100644 --- a/babl/babl-sanity.c +++ b/babl/babl-sanity.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-internal.h" static int OK; @@ -45,7 +46,7 @@ type_sanity (Babl *babl, { for (i = 0; i < babl_list_size (list); i++) { - if (babl_conversion_destination ((Babl *) list->items[i]) == babl_type_id (BABL_DOUBLE)) + if (babl_conversion_destination ((Babl *) list->items[i]) == babl_type_from_id (BABL_DOUBLE)) { ok = 1; break; @@ -78,7 +79,7 @@ model_sanity (Babl *babl, { for (i = 0; i < babl_list_size (list); i++) { - if (babl_conversion_destination ((Babl *) list->items[i]) == babl_model_id (BABL_RGBA)) + if (babl_conversion_destination ((Babl *) list->items[i]) == babl_model_from_id (BABL_RGBA)) { ok = 1; break; @@ -115,17 +116,17 @@ babl_sanity (void) { OK=1; - babl_type_each (id_sanity, NULL); - babl_component_each (id_sanity, NULL); - babl_model_each (id_sanity, NULL); - babl_format_each (id_sanity, NULL); - - babl_type_each (type_sanity, NULL); - babl_sampling_each (foo, NULL); - babl_component_each (foo, NULL); - babl_model_each (model_sanity, NULL); - babl_format_each (foo, NULL); - babl_conversion_each (foo, NULL); + babl_type_class_for_each (id_sanity, NULL); + babl_component_class_for_each (id_sanity, NULL); + babl_model_class_for_each (id_sanity, NULL); + babl_format_class_for_each (id_sanity, NULL); + + babl_type_class_for_each (type_sanity, NULL); + babl_sampling_class_for_each (foo, NULL); + babl_component_class_for_each (foo, NULL); + babl_model_class_for_each (model_sanity, NULL); + babl_format_class_for_each (foo, NULL); + babl_conversion_class_for_each (foo, NULL); return OK; } diff --git a/babl/babl-type.c b/babl/babl-type.c index 399d831..c150e2c 100644 --- a/babl/babl-type.c +++ b/babl/babl-type.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include #include @@ -252,4 +253,4 @@ babl_type_is_symmetric (Babl *babl) return is_symmetrical; } -BABL_CLASS (type) +BABL_CLASS_IMPLEMENT (type) diff --git a/babl/babl-type.h b/babl/babl-type.h index ee51eb7..10e4040 100644 --- a/babl/babl-type.h +++ b/babl/babl-type.h @@ -16,30 +16,10 @@ * . */ -#ifndef _BABL_H -#error this file is only to be included by babl.h -#endif +#ifndef _BABL_TYPE_H +#define _BABL_TYPE_H -/****************************************************************/ -/* BablType */ -BABL_NAMED_CLASS (type); -/* - * A data type that babl can have in it's buffers, requires - * conversions to and from "double" to be registered before - * passing sanity. - * - * Babl * babl_type_new ( const char *name, - * "bits", int bits, - * ["min_val", double min_val,] - * ["max_val", double max_val,] - * NULL); - */ -Babl *babl_type_id (int id); -void babl_type_each (BablEachFunction each_fun, - void *user_data); -Babl * babl_type (const char *name); -Babl * babl_type_new (void *first_arg, - ...) BABL_ARG_NULL_TERMINATED; +BABL_NAMED_CLASS_DECLARE (type); typedef struct { @@ -66,3 +46,5 @@ typedef struct * biased_exponent * mantissa */ } BablTypeFloat; + +#endif diff --git a/babl/babl-types.h b/babl/babl-types.h new file mode 100644 index 0000000..d1deae7 --- /dev/null +++ b/babl/babl-types.h @@ -0,0 +1,49 @@ +/* babl - dynamically extendable universal pixel conversion library. + * Copyright (C) 2005-2008, Øyvind KolÃ¥s and others. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General + * Public License along with this library; if not, see + * . + */ + +#ifndef _BABL_TYPES_H +#define _BABL_TYPES_H + +#ifndef BABL_INSIDE_BABL_H +#error "babl-version.h must not be included directly, include babl.h instead." +#endif + + +/** + * The babl API is based around polymorphism and almost everything is + * a Babl object. + */ +typedef union _Babl Babl; + +/* Conversion function between linear data of a either a data types or + * color formats. + */ +typedef long (*BablFuncLinear) (char *src, + char *dst, + long n); + +/* TypePlanar,ModelPlanar and FormatPlanar */ +typedef long (*BablFuncPlanar) (int src_bands, + char *src[], + int src_pitch[], + int dst_bands, + char *dst[], + int dst_pitch[], + long n); + +#endif diff --git a/babl/babl-util.c b/babl/babl-util.c index e79e1b8..6abcd43 100644 --- a/babl/babl-util.c +++ b/babl/babl-util.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include "babl-internal.h" diff --git a/babl/babl-version.c b/babl/babl-version.c index b1805ef..81e4efd 100644 --- a/babl/babl-version.c +++ b/babl/babl-version.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-internal.h" diff --git a/babl/babl-version.h b/babl/babl-version.h index e297b56..288947d 100644 --- a/babl/babl-version.h +++ b/babl/babl-version.h @@ -19,6 +19,11 @@ #ifndef _BABL_VERSION_H #define _BABL_VERSION_H +#ifndef BABL_INSIDE_BABL_H +#error "babl-version.h must not be included directly, include babl.h instead." +#endif + + /*** * babl version information * @@ -28,8 +33,8 @@ */ #define BABL_MAJOR_VERSION 0 -#define BABL_MINOR_VERSION 0 -#define BABL_MICRO_VERSION 22 +#define BABL_MINOR_VERSION 1 +#define BABL_MICRO_VERSION 0 /** Get the version information on the babl library */ void babl_get_version (int *major, diff --git a/babl/babl-version.h.in b/babl/babl-version.h.in index 40d3930..9789099 100644 --- a/babl/babl-version.h.in +++ b/babl/babl-version.h.in @@ -19,6 +19,11 @@ #ifndef _BABL_VERSION_H #define _BABL_VERSION_H +#ifndef BABL_INSIDE_BABL_H +#error "babl-version.h must not be included directly, include babl.h instead." +#endif + + /*** * babl version information * diff --git a/babl/babl.c b/babl/babl.c index 97ec6fc..08c4345 100644 --- a/babl/babl.c +++ b/babl/babl.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-internal.h" static int ref_count = 0; @@ -28,25 +29,25 @@ babl_init (void) if (ref_count++ == 0) { babl_internal_init (); - babl_type_init (); - babl_sampling_init (); - babl_component_init (); - babl_model_init (); - babl_format_init (); - babl_conversion_init (); + babl_type_class_init (); + babl_sampling_class_init (); + babl_component_class_init (); + babl_model_class_init (); + babl_format_class_init (); + babl_conversion_class_init (); babl_core_init (); babl_sanity (); babl_extension_base (); babl_sanity (); - babl_extension_init (); + babl_extension_class_init (); babl_sanity (); - babl_fish_init (); + babl_fish_class_init (); babl_sanity (); } } void -babl_destroy (void) +babl_exit (void) { if (!-- ref_count) { @@ -62,14 +63,14 @@ babl_destroy (void) } } - babl_extension_destroy (); - babl_fish_destroy (); - babl_conversion_destroy (); - babl_format_destroy (); - babl_model_destroy (); - babl_component_destroy (); - babl_sampling_destroy (); - babl_type_destroy (); + babl_extension_class_destroy (); + babl_fish_class_destroy (); + babl_conversion_class_destroy (); + babl_format_class_destroy (); + babl_model_class_destroy (); + babl_component_class_destroy (); + babl_sampling_class_destroy (); + babl_type_class_destroy (); babl_internal_destroy (); babl_memory_sanity (); } diff --git a/babl/babl.h b/babl/babl.h index 019f96a..44276a4 100644 --- a/babl/babl.h +++ b/babl/babl.h @@ -16,164 +16,188 @@ * . */ -/* NOTE! the babl API is polymorphic, it is probably easier to learn - * it's usage by studying examples than this header file. The public - * functions are attempted explained anyways. - */ - #ifndef _BABL_H #define _BABL_H -#include - -#ifdef _BABL_INTERNAL_H -#error babl.h included after babl-internal.h +#ifdef __cplusplus +extern "C" { #endif -typedef union _Babl Babl; -/* Union used for quick convenient access to any field of any BablInstance */ +#define BABL_INSIDE_BABL_H +#include +#include +#include +#undef BABL_INSIDE_BABL_H -typedef struct _BablList BablList; -#ifndef BABL_HARD_MAX_PATH_LENGTH -#define BABL_HARD_MAX_PATH_LENGTH 16 -#endif +/** + * Initializes the babl library. + */ +void babl_init (void); -/* magic number used at the start of all babl objects, used to do - * differentiation in polymorphic functions. (as well as manual - * type check assertions). +/** + * Deinitializes the babl library and frees any resources used when + * matched with the number of calls to babl_init(). */ -#define BABL_MAGIC 0xbAb100 +void babl_exit (void); -enum { - BABL_INSTANCE = BABL_MAGIC, - BABL_TYPE, - BABL_TYPE_INTEGER, - BABL_TYPE_FLOAT, - BABL_SAMPLING, - BABL_COMPONENT, - BABL_MODEL, - BABL_FORMAT, +/** + * Returns the babl object representing the data type given by @name + * such as for example "u8", "u16" or "float". + */ +Babl * babl_type (const char *name); - BABL_CONVERSION, - BABL_CONVERSION_LINEAR, - BABL_CONVERSION_PLANE, - BABL_CONVERSION_PLANAR, +/** + * Returns the babl object representing the @horizontal and @vertical + * sampling such as for example 2, 2 for the chroma components in + * YCbCr. + */ +Babl * babl_sampling (int horizontal, + int vertical); - BABL_FISH, - BABL_FISH_REFERENCE, - BABL_FISH_SIMPLE, - BABL_FISH_PATH, - BABL_IMAGE, +/** + * Returns the babl object representing the color component given by + * @name such as for example "R", "cyan" or "CIE L". + */ +Babl * babl_component (const char *name); - BABL_EXTENSION, +/** + * Returns the babl object representing the color model given by @name + * such as for example "RGB", "CMYK" or "CIE Lab". + */ +Babl * babl_model (const char *name); - BABL_SKY -}; -typedef unsigned int BablClassType; +/** + * Returns the babl object representing the color format given by + * @name such as for example "RGB u8", "CMYK float" or "CIE Lab u16". + */ +Babl * babl_format (const char *name); -/** Initialize the babl library */ -void babl_init (void); +/* Create a babl fish capable of converting from source_format to + * destination_format, source and destination can be either strings + * with the names of the formats or Babl-format objects. + */ +Babl * babl_fish (const void *source_format, + const void *destination_format); -/** Deinitialize the babl library (frees any resources used, if the number - * of calls to babl_destroy() is is equal to the number of calls to - * babl_init() +/** Process n pixels from source to destination using babl_fish, + * returns number of pixels converted. */ -void babl_destroy (void); +long babl_process (Babl *babl_fish, + void *source, + void *destination, + long n); -#if __GNUC__ >= 4 -#define BABL_ARG_NULL_TERMINATED __attribute__((__sentinel__)) -#else -#define BABL_ARG_NULL_TERMINATED -#endif -typedef int (*BablEachFunction) (Babl *entry, - void *data); +/** + * Returns a string decsribing a Babl object. + */ +const char * babl_get_name (const Babl *babl); + +/** + * Returns whether the @format has an alpha channel. + */ +int babl_format_has_alpha (const Babl *format); + +/** + * Returns the bytes per pixel for a babl color format. + */ +int babl_format_get_bytes_per_pixel (const Babl *format); -/* All Classes in babl have common functionality like the ability - * to be iterated over, common functionality is defined through these - * macros. +/** + * Returns the number of components for the given @format. */ -#define BABL_CLASS(klass) \ - \ -void babl_##klass##_init (void); \ -void babl_##klass##_destroy (void); \ -Babl * babl_##klass##_id (int id); \ -void babl_##klass##_each (BablEachFunction each_fun, \ - void *user_data) +int babl_format_get_n_components (const Babl *format); -/* creates a class that has a specific name connected to it, that - * also allows defining a new instance. These classes share common - * functionality with the non_name classes but have two extra methods, - * the means to lookup by name, as well as to create new named objects - * that later can be looked up. +/** + * Returns the type in the given @format for the given + * @component_index. */ -#define BABL_NAMED_CLASS(klass) \ - \ -BABL_CLASS (klass); \ -Babl * babl_##klass (const char *name); \ -Babl * babl_##klass##_new (void *first_arg, \ - ...) BABL_ARG_NULL_TERMINATED +Babl * babl_format_get_type (const Babl *format, + int component_index); +/** + * Defines a new data type in babl. A data type that babl can have in + * its buffers requires conversions to and from "double" to be + * registered before passing sanity. + * + * babl_type_new (const char *name, + * "bits", int bits, + * ["min_val", double min_val,] + * ["max_val", double max_val,] + * NULL); + */ +Babl * babl_type_new (void *first_arg, + ...) BABL_ARG_NULL_TERMINATED; -/* common header for any item inserted into database, the actual - * implementation of babl-instance is in babl-internal +/** + * Defines a new color component with babl. + * + * babl_component_new (const char *name, + * NULL); */ -typedef struct -{ - BablClassType class_type; - int id; /*< a numerical id, look at 'babl-ids.h' for the reserved - ones */ - void *creator; - char *name; /*< the name this type exists under */ -} BablInstance; +Babl * babl_component_new (void *first_arg, + ...) BABL_ARG_NULL_TERMINATED; /** - * babl_name: + * Defines a new color model in babl. If no name is provided a name is + * generated by concatenating the name of all the involved components. * - * Return a string decsribing a BablInstance, might work better than - * babl->instance.name when a good human readable name is desired. + * babl_model_new (["name", const char *name,] + * BablComponent *component1, + * [BablComponent *componentN, ...] + * NULL); + */ +Babl * babl_model_new (void *first_arg, + ...) BABL_ARG_NULL_TERMINATED; + +/** + * Defines a new color format in babl. Provided BablType and|or + * BablSampling is valid for the following components as well. If no + * name is provided a (long) descriptive name is used. * - * Returns: a name describing the instance. - */ -const char * babl_name (const Babl *babl); - -void babl_introspect (Babl *babl); /* introspect a given BablObject */ - -#include "babl-version.h" -#include "babl-type.h" -#include "babl-sampling.h" -#include "babl-component.h" -#include "babl-model.h" -#include "babl-format.h" -#include "babl-image.h" -#include "babl-conversion.h" -#include "babl-fish.h" -#include "babl-extension.h" - -/* This union can be used for convenient access to any field without the need - * to case if the variable already is of the type Babl * - */ -typedef union _Babl -{ - BablClassType class_type; - BablInstance instance; - BablType type; - BablSampling sampling; - BablComponent component; - BablModel model; - BablFormat format; - BablConversion conversion; - BablImage image; - BablFish fish; - BablFishReference fish_reference; - BablFishSimple fish_simple; - BablFishPath fish_path; - BablExtension extension; -} _Babl; - -#undef BABL_CLASS -#undef BABL_NAMED_CLASS + * babl_format_new (["name", const char *name,] + * BablModel *model, + * [BablType *type,] + * [BablSampling, *sampling,] + * BablComponent *component1, + * [[BablType *type,] + * [BablSampling *sampling,] + * BablComponent *componentN, + * ...] + * ["planar",] + * NULL); + */ +Babl * babl_format_new (void *first_arg, + ...) BABL_ARG_NULL_TERMINATED; + +/** + * Defines a new conversion between either two formats, two models or + * two types in babl. + * + * babl_conversion_new (, + * <"linear"|"planar">, conv_func, + * NULL); + */ +Babl * babl_conversion_new (void *first_arg, + ...) BABL_ARG_NULL_TERMINATED; + + +/* + * Backwards compatibility stuff + * + * NOTE: will most likely be removed in the first stable release! + */ +#ifndef BABL_DISABLE_DEPRECATED +#define babl_destroy babl_exit +#endif + + +#ifdef __cplusplus +} +#endif #endif diff --git a/babl/base/Makefile.am b/babl/base/Makefile.am index 4fda1ba..1c1da0f 100644 --- a/babl/base/Makefile.am +++ b/babl/base/Makefile.am @@ -13,13 +13,13 @@ c_sources = \ model-gray.c \ model-ycbcr.c -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl noinst_LTLIBRARIES= libbase.la libbase_la_SOURCES= $(h_sources) $(c_sources) +libbase_la_LIBADD = $(MATH_LIB) -EXTRA_DIST := \ +EXTRA_DIST = \ rgb-constants.h \ util.h -LDADD = $(MATH_LIB) diff --git a/babl/base/Makefile.in b/babl/base/Makefile.in index 675ddc8..104d1f5 100644 --- a/babl/base/Makefile.in +++ b/babl/base/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -47,24 +43,26 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) -libbase_la_LIBADD = +am__DEPENDENCIES_1 = +libbase_la_DEPENDENCIES = $(am__DEPENDENCIES_1) am__objects_1 = am__objects_2 = babl-base.lo formats.lo type-float.lo type-u8.lo \ type-u16.lo type-u32.lo model-rgb.lo model-gray.lo \ model-ycbcr.lo am_libbase_la_OBJECTS = $(am__objects_1) $(am__objects_2) libbase_la_OBJECTS = $(am_libbase_la_OBJECTS) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ SOURCES = $(libbase_la_SOURCES) DIST_SOURCES = $(libbase_la_SOURCES) ETAGS = etags @@ -72,8 +70,6 @@ CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -92,8 +88,6 @@ BABL_MINOR_VERSION = @BABL_MINOR_VERSION@ BABL_REAL_VERSION = @BABL_REAL_VERSION@ BABL_RELEASE = @BABL_RELEASE@ BABL_UNSTABLE = @BABL_UNSTABLE@ -BABL_UNSTABLE_FALSE = @BABL_UNSTABLE_FALSE@ -BABL_UNSTABLE_TRUE = @BABL_UNSTABLE_TRUE@ BABL_VERSION = @BABL_VERSION@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -110,7 +104,6 @@ DEPDIR = @DEPDIR@ DIR_SEP = @DIR_SEP@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ -DYNAMICLIB = @DYNAMICLIB@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -120,11 +113,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ -HAVE_INKSCAPE_FALSE = @HAVE_INKSCAPE_FALSE@ -HAVE_INKSCAPE_TRUE = @HAVE_INKSCAPE_TRUE@ -HAVE_W3M_FALSE = @HAVE_W3M_FALSE@ -HAVE_W3M_TRUE = @HAVE_W3M_TRUE@ -INKSCAPE = @INKSCAPE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -136,18 +125,13 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MATH_LIB = @MATH_LIB@ +MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_UNIX_FALSE = @OS_UNIX_FALSE@ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -156,9 +140,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEP = @PATH_SEP@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +RSVG = @RSVG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -169,13 +152,13 @@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ WEBSITE_LOCATION = @WEBSITE_LOCATION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -187,6 +170,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -214,8 +198,12 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ h_sources = \ babl-base.h @@ -230,14 +218,14 @@ c_sources = \ model-gray.c \ model-ycbcr.c -INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/babl +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl noinst_LTLIBRARIES = libbase.la libbase_la_SOURCES = $(h_sources) $(c_sources) -EXTRA_DIST := \ +libbase_la_LIBADD = $(MATH_LIB) +EXTRA_DIST = \ rgb-constants.h \ util.h -LDADD = $(MATH_LIB) all: all-am .SUFFIXES: @@ -281,7 +269,7 @@ clean-noinstLTLIBRARIES: rm -f "$${dir}/so_locations"; \ done libbase.la: $(libbase_la_OBJECTS) $(libbase_la_DEPENDENCIES) - $(LINK) $(libbase_la_LDFLAGS) $(libbase_la_OBJECTS) $(libbase_la_LIBADD) $(LIBS) + $(LINK) $(libbase_la_OBJECTS) $(libbase_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -300,22 +288,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/type-u8.Plo@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -326,17 +314,13 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -348,8 +332,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -359,13 +343,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -379,22 +362,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -442,7 +424,7 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-am @@ -456,12 +438,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -482,19 +472,22 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ clean-libtool clean-noinstLTLIBRARIES ctags distclean \ distclean-compile distclean-generic distclean-libtool \ distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-info-am + pdf pdf-am ps ps-am tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/babl/base/babl-base.c b/babl/base/babl-base.c index d8cbbf6..1271a43 100644 --- a/babl/base/babl-base.c +++ b/babl/base/babl-base.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-base.h" extern int babl_hmpf_on_name_lookups; diff --git a/babl/base/formats.c b/babl/base/formats.c index 84f1598..5e6e0c0 100644 --- a/babl/base/formats.c +++ b/babl/base/formats.c @@ -16,6 +16,10 @@ * . */ +#include "config.h" +#include + +#include "babl-classes.h" #include "babl.h" #include "babl-ids.h" #include "babl-base.h" @@ -24,286 +28,286 @@ void babl_formats_init (void) { babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_type_id (BABL_DOUBLE), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_type_from_id (BABL_DOUBLE), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGB_GAMMA_2_2), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), + babl_model_from_id (BABL_RGB_GAMMA_2_2), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), NULL); babl_format_new ( - babl_model_id (BABL_RGB_GAMMA_2_2), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), + babl_model_from_id (BABL_RGB_GAMMA_2_2), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), NULL); babl_format_new ( - babl_model_id (BABL_RGB_GAMMA_2_2), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), + babl_model_from_id (BABL_RGB_GAMMA_2_2), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMA_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMA_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMA_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMA_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMA), NULL); babl_format_new ( "name", "Y'CbCr u8", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), NULL); babl_format_new ( - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), NULL); babl_format_new ( - babl_model_id (BABL_YCBCR_ALPHA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_YCBCR_ALPHA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA), - babl_type_id (BABL_DOUBLE), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_DOUBLE), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_PREMULTIPLIED), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED_MUL_ALPHA), - babl_component_id (BABL_GREEN_MUL_ALPHA), - babl_component_id (BABL_BLUE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_PREMULTIPLIED), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_PREMULTIPLIED), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED_MUL_ALPHA), - babl_component_id (BABL_GREEN_MUL_ALPHA), - babl_component_id (BABL_BLUE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_PREMULTIPLIED), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGBA_PREMULTIPLIED), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_MUL_ALPHA), - babl_component_id (BABL_GREEN_MUL_ALPHA), - babl_component_id (BABL_BLUE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_PREMULTIPLIED), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_RGB), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_model_from_id (BABL_RGB), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), NULL); babl_format_new ( - babl_model_id (BABL_RGB), - babl_type_id (BABL_U16), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_model_from_id (BABL_RGB), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), NULL); babl_format_new ( - babl_model_id (BABL_RGB), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_model_from_id (BABL_RGB), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMINANCE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMINANCE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMINANCE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMINANCE), + babl_model_from_id (BABL_GRAY), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMINANCE), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMINANCE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMINANCE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMINANCE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY), - babl_type_id (BABL_U16), - babl_component_id (BABL_LUMINANCE), + babl_model_from_id (BABL_GRAY), + babl_type_from_id (BABL_U16), + babl_component_from_id (BABL_LUMINANCE), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMINANCE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMINANCE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMINANCE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( - babl_model_id (BABL_GRAY), - babl_type_id (BABL_U8), - babl_component_id (BABL_LUMINANCE), + babl_model_from_id (BABL_GRAY), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_LUMINANCE), NULL); /* overriding name, since the generated name would be wrong due @@ -311,28 +315,28 @@ babl_formats_init (void) */ babl_format_new ( "name", "Y'CbCr u8", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), - NULL); - babl_format_new ( - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), - NULL); - babl_format_new ( - babl_model_id (BABL_YCBCR_ALPHA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), + NULL); + babl_format_new ( + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), + NULL); + babl_format_new ( + babl_model_from_id (BABL_YCBCR_ALPHA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), + babl_component_from_id (BABL_ALPHA), NULL); } diff --git a/babl/base/model-gray.c b/babl/base/model-gray.c index 4ca0f88..e6b907c 100644 --- a/babl/base/model-gray.c +++ b/babl/base/model-gray.c @@ -16,6 +16,10 @@ * . */ +#include "config.h" +#include + +#include "babl-classes.h" #include "babl.h" #include "babl-ids.h" #include "util.h" @@ -67,38 +71,38 @@ models (void) { babl_model_new ( "id", BABL_GRAY, - babl_component_id (BABL_LUMINANCE), + babl_component_from_id (BABL_LUMINANCE), NULL); babl_model_new ( "id", BABL_GRAY_ALPHA, - babl_component_id (BABL_LUMINANCE), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_LUMINANCE), + babl_component_from_id (BABL_ALPHA), NULL); babl_model_new ( "id", BABL_GRAY_ALPHA_PREMULTIPLIED, - babl_component_id (BABL_LUMINANCE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_LUMINANCE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_model_new ( "id", BABL_GRAY_GAMMA_2_2, - babl_component_id (BABL_LUMA), + babl_component_from_id (BABL_LUMA), NULL); babl_model_new ( "id", BABL_GRAY_GAMMA_2_2_ALPHA, - babl_component_id (BABL_LUMA), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_ALPHA), NULL); babl_model_new ( "id", BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED, - babl_component_id (BABL_LUMA_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_LUMA_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); } @@ -308,7 +312,7 @@ gray_alpha_premultiplied_to_rgba (int src_bands, double luminance = *(double *) src[0]; double alpha = *(double *) src[1]; - if (alpha > 0.00001) + if (alpha > BABL_ALPHA_THRESHOLD) { luminance = luminance / alpha; } @@ -408,13 +412,13 @@ premultiplied_to_non_premultiplied (int src_bands, alpha = *(double *) src[src_bands - 1]; for (band = 0; band < src_bands - 1; band++) { - if (alpha > 0.001) + if (alpha > BABL_ALPHA_THRESHOLD) { *(double *) dst[band] = *(double *) src[band] / alpha; } else { - *(double *) dst[band] = 0.001; + *(double *) dst[band] = 0.0; } } *(double *) dst[dst_bands - 1] = alpha; @@ -484,100 +488,100 @@ static void conversions (void) { babl_conversion_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), "planar", gray_2_2_to_rgb, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2), "planar", rgb_to_gray_2_2, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA), + babl_model_from_id (BABL_RGBA), "planar", gray_2_2_to_rgb, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA), "planar", rgb_to_gray_2_2, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), "linear", gray_gamma_2_2_premultiplied2rgba, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_GAMMA_2_2_ALPHA_PREMULTIPLIED), "linear", rgba2gray_gamma_2_2_premultiplied, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY), + babl_model_from_id (BABL_RGBA), "linear", gray_to_rgba, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_ALPHA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_ALPHA), + babl_model_from_id (BABL_RGBA), "linear", graya_to_rgba, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_ALPHA), "linear", rgba_to_graya, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY), "linear", rgba_to_gray, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_ALPHA), - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_GRAY_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), "planar", non_premultiplied_to_premultiplied, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), - babl_model_id (BABL_GRAY_ALPHA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_GRAY_ALPHA), "planar", premultiplied_to_non_premultiplied, NULL ); babl_conversion_new ( - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), "planar", gray_alpha_premultiplied_to_rgba, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_GRAY_ALPHA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_GRAY_ALPHA_PREMULTIPLIED), "planar", rgba_to_gray_alpha_premultiplied, NULL ); diff --git a/babl/base/model-rgb.c b/babl/base/model-rgb.c index a1c1c37..8de970e 100644 --- a/babl/base/model-rgb.c +++ b/babl/base/model-rgb.c @@ -16,8 +16,12 @@ * . */ +#include "config.h" +#include #include + #include "babl.h" +#include "babl-classes.h" #include "babl-ids.h" #include "util.h" #include "babl-base.h" @@ -109,40 +113,40 @@ models (void) { babl_model_new ( "id", BABL_RGB, - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), NULL); babl_model_new ( "id", BABL_RGBA_PREMULTIPLIED, - babl_component_id (BABL_RED_MUL_ALPHA), - babl_component_id (BABL_GREEN_MUL_ALPHA), - babl_component_id (BABL_BLUE_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_RED_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); babl_model_new ( "id", BABL_RGB_GAMMA_2_2, - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), NULL); babl_model_new ( "id", BABL_RGBA_GAMMA_2_2, - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_model_new ( "id", BABL_RGBA_GAMMA_2_2_PREMULTIPLIED, - babl_component_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_RED_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_GREEN_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_BLUE_GAMMA_2_2_MUL_ALPHA), + babl_component_from_id (BABL_ALPHA), NULL); } @@ -283,7 +287,7 @@ premultiplied_to_non_premultiplied (int src_bands, alpha = *(double *) src[src_bands - 1]; for (band = 0; band < src_bands - 1; band++) { - if (alpha > 0.001) + if (alpha > BABL_ALPHA_THRESHOLD) { *(double *) dst[band] = *(double *) src[band] / alpha; } @@ -332,7 +336,7 @@ rgba_gamma_2_2_premultiplied2rgba (char *src, while (n--) { double alpha = ((double *) src)[3]; - if (alpha > 0.0001) + if (alpha > BABL_ALPHA_THRESHOLD) { ((double *) dst)[0] = gamma_2_2_to_linear (((double *) src)[0] / alpha); ((double *) dst)[1] = gamma_2_2_to_linear (((double *) src)[1] / alpha); @@ -399,73 +403,73 @@ static void conversions (void) { babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA), "planar", copy_strip_1, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGB), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGB), + babl_model_from_id (BABL_RGBA), "planar", copy_strip_1, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGB), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGB), "planar", copy_strip_1, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_PREMULTIPLIED), "planar", non_premultiplied_to_premultiplied, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA_PREMULTIPLIED), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), "planar", premultiplied_to_non_premultiplied, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGB_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGB_GAMMA_2_2), "planar", g3_gamma_2_2, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGB_GAMMA_2_2), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGB_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), "planar", g3_inv_gamma_2_2, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), "linear", rgba2rgba_gamma_2_2, NULL); babl_conversion_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_model_from_id (BABL_RGBA), "linear", rgba_gamma_2_22rgba, NULL); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), "linear", rgba2rgba_gamma_2_2_premultiplied, NULL); babl_conversion_new ( - babl_model_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2_PREMULTIPLIED), + babl_model_from_id (BABL_RGBA), "linear", rgba_gamma_2_2_premultiplied2rgba, NULL); } @@ -474,51 +478,51 @@ static void formats (void) { babl_format_new ( - //"name", "srgb", + /*"name", "srgb",*/ "id", BABL_SRGB, - babl_model_id (BABL_RGB_GAMMA_2_2), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), + babl_model_from_id (BABL_RGB_GAMMA_2_2), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), NULL); babl_format_new ( "id", BABL_SRGBA, - babl_model_id (BABL_RGBA_GAMMA_2_2), - babl_type_id (BABL_U8), - babl_component_id (BABL_RED_GAMMA_2_2), - babl_component_id (BABL_GREEN_GAMMA_2_2), - babl_component_id (BABL_BLUE_GAMMA_2_2), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA_GAMMA_2_2), + babl_type_from_id (BABL_U8), + babl_component_from_id (BABL_RED_GAMMA_2_2), + babl_component_from_id (BABL_GREEN_GAMMA_2_2), + babl_component_from_id (BABL_BLUE_GAMMA_2_2), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( "id", BABL_RGBA_FLOAT, - babl_model_id (BABL_RGBA), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), - babl_component_id (BABL_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), + babl_component_from_id (BABL_ALPHA), NULL); babl_format_new ( "id", BABL_RGB_FLOAT, - babl_model_id (BABL_RGB), - babl_type_id (BABL_FLOAT), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_model_from_id (BABL_RGB), + babl_type_from_id (BABL_FLOAT), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), NULL); #ifdef XXXX babl_format_new ( "id", BABL_RGB565, - babl_model_id (BABL_RGB), - babl_component_id (BABL_RED), - babl_component_id (BABL_GREEN), - babl_component_id (BABL_BLUE), + babl_model_from_id (BABL_RGB), + babl_component_from_id (BABL_RED), + babl_component_from_id (BABL_GREEN), + babl_component_from_id (BABL_BLUE), ); #endif diff --git a/babl/base/model-ycbcr.c b/babl/base/model-ycbcr.c index 10551a7..c4f6ab9 100644 --- a/babl/base/model-ycbcr.c +++ b/babl/base/model-ycbcr.c @@ -16,10 +16,13 @@ * . */ +#include "config.h" #include #include #include + #include "babl.h" +#include "babl-classes.h" #include "babl-ids.h" #include "babl-base.h" @@ -60,17 +63,17 @@ models (void) { babl_model_new ( "id", BABL_YCBCR, - babl_component_id (BABL_LUMA), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), NULL); babl_model_new ( "id", BABL_YCBCR_ALPHA, - babl_component_id (BABL_LUMA), - babl_component_id (BABL_CB), - babl_component_id (BABL_CR), - babl_component_id (BABL_ALPHA), + babl_component_from_id (BABL_LUMA), + babl_component_from_id (BABL_CB), + babl_component_from_id (BABL_CR), + babl_component_from_id (BABL_ALPHA), NULL); } @@ -209,26 +212,26 @@ static void conversions (void) { babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_YCBCR), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_YCBCR), "linear", rgba_to_ycbcr, NULL ); babl_conversion_new ( - babl_model_id (BABL_YCBCR), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_YCBCR), + babl_model_from_id (BABL_RGBA), "linear", ycbcr_to_rgba, NULL ); babl_conversion_new ( - babl_model_id (BABL_RGBA), - babl_model_id (BABL_YCBCR_ALPHA), + babl_model_from_id (BABL_RGBA), + babl_model_from_id (BABL_YCBCR_ALPHA), "linear", rgba_to_ycbcra, NULL ); babl_conversion_new ( - babl_model_id (BABL_YCBCR_ALPHA), - babl_model_id (BABL_RGBA), + babl_model_from_id (BABL_YCBCR_ALPHA), + babl_model_from_id (BABL_RGBA), "linear", ycbcra_to_rgba, NULL ); @@ -241,15 +244,15 @@ formats (void) "name", "Y'CbCr u8", "id", BABL_YCBCR420, "planar", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), babl_sampling (1, 1), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), babl_sampling (2, 2), - babl_component_id (BABL_CB), + babl_component_from_id (BABL_CB), babl_sampling (2, 2), - babl_component_id (BABL_CR), + babl_component_from_id (BABL_CR), NULL); return; @@ -257,15 +260,15 @@ formats (void) "name", "y'cbcr420", "id", BABL_YCBCR420, "planar", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), babl_sampling (1, 1), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), babl_sampling (2, 2), - babl_component_id (BABL_CB), + babl_component_from_id (BABL_CB), babl_sampling (2, 2), - babl_component_id (BABL_CR), + babl_component_from_id (BABL_CR), NULL); @@ -273,29 +276,29 @@ formats (void) "name", "y'cbcr422", "id", BABL_YCBCR422, "planar", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), babl_sampling (1, 1), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), babl_sampling (2, 1), - babl_component_id (BABL_CB), + babl_component_from_id (BABL_CB), babl_sampling (2, 1), - babl_component_id (BABL_CR), + babl_component_from_id (BABL_CR), NULL); babl_format_new ( "name", "y'cbcr411", "id", BABL_YCBCR411, "planar", - babl_model_id (BABL_YCBCR), - babl_type_id (BABL_U8_LUMA), + babl_model_from_id (BABL_YCBCR), + babl_type_from_id (BABL_U8_LUMA), babl_sampling (1, 1), - babl_component_id (BABL_LUMA), - babl_type_id (BABL_U8_CHROMA), + babl_component_from_id (BABL_LUMA), + babl_type_from_id (BABL_U8_CHROMA), babl_sampling (4, 1), - babl_component_id (BABL_CB), + babl_component_from_id (BABL_CB), babl_sampling (4, 1), - babl_component_id (BABL_CR), + babl_component_from_id (BABL_CR), NULL); } diff --git a/babl/base/rgb-constants.h b/babl/base/rgb-constants.h index d8a428c..8f8b410 100644 --- a/babl/base/rgb-constants.h +++ b/babl/base/rgb-constants.h @@ -16,7 +16,9 @@ * . */ -//#define CONTEMPORARY_MONITOR +#if 0 +#define CONTEMPORARY_MONITOR +#endif #ifdef CONTEMPORARY_MONITOR /* source: http://www.poynton.com/ColorFAQ.html */ diff --git a/babl/base/type-float.c b/babl/base/type-float.c index 25b882d..ce7e407 100644 --- a/babl/base/type-float.c +++ b/babl/base/type-float.c @@ -16,10 +16,12 @@ * . */ +#include "config.h" #include #include #include "babl.h" +#include "babl-classes.h" #include "babl-ids.h" #include "babl-base.h" @@ -65,15 +67,15 @@ babl_base_type_float (void) NULL); babl_conversion_new ( - babl_type_id (BABL_FLOAT), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_FLOAT), + babl_type_from_id (BABL_DOUBLE), "plane", convert_float_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_FLOAT), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_FLOAT), "plane", convert_double_float, NULL ); diff --git a/babl/base/type-u16.c b/babl/base/type-u16.c index bbb548f..9fcad8b 100644 --- a/babl/base/type-u16.c +++ b/babl/base/type-u16.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include #include @@ -107,7 +108,7 @@ convert_u16_double_scaled (double min_val, src, dst, src_pitch, dst_pitch, n); \ } -MAKE_CONVERSIONS (u16, 0.0, 1.0, 0, UINT16_MAX); +MAKE_CONVERSIONS (u16, 0.0, 1.0, 0, UINT16_MAX) void babl_base_type_u16 (void) @@ -119,15 +120,15 @@ babl_base_type_u16 (void) NULL); babl_conversion_new ( - babl_type_id (BABL_U16), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_U16), + babl_type_from_id (BABL_DOUBLE), "plane", convert_u16_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_U16), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_U16), "plane", convert_double_u16, NULL ); diff --git a/babl/base/type-u32.c b/babl/base/type-u32.c index cb1854a..fc38a01 100644 --- a/babl/base/type-u32.c +++ b/babl/base/type-u32.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include #include @@ -106,7 +107,7 @@ convert_u32_double_scaled (double min_val, src, dst, src_pitch, dst_pitch, n); \ } -MAKE_CONVERSIONS (u32, 0.0, 1.0, 0, UINT32_MAX); +MAKE_CONVERSIONS (u32, 0.0, 1.0, 0, UINT32_MAX) void babl_base_type_u32 (void) @@ -118,15 +119,15 @@ babl_base_type_u32 (void) NULL); babl_conversion_new ( - babl_type_id (BABL_U32), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_U32), + babl_type_from_id (BABL_DOUBLE), "plane", convert_u32_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_U32), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_U32), "plane", convert_double_u32, NULL ); diff --git a/babl/base/type-u8.c b/babl/base/type-u8.c index 592258f..9a67a0e 100644 --- a/babl/base/type-u8.c +++ b/babl/base/type-u8.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include #include @@ -107,9 +108,9 @@ convert_u8_double_scaled (double min_val, src, dst, src_pitch, dst_pitch, n); \ } -MAKE_CONVERSIONS (u8, 0.0, 1.0, 0x00, UINT8_MAX); -MAKE_CONVERSIONS (u8_luma, 0.0, 1.0, 16, 235); -MAKE_CONVERSIONS (u8_chroma, 0.0, 1.0, 16, 240); +MAKE_CONVERSIONS (u8, 0.0, 1.0, 0x00, UINT8_MAX) +MAKE_CONVERSIONS (u8_luma, 0.0, 1.0, 16, 235) +MAKE_CONVERSIONS (u8_chroma, 0.0, 1.0, 16, 240) void babl_base_type_u8 (void) @@ -140,38 +141,38 @@ babl_base_type_u8 (void) NULL ); babl_conversion_new ( - babl_type_id (BABL_U8), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8), + babl_type_from_id (BABL_DOUBLE), "plane", convert_u8_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_U8), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8), "plane", convert_double_u8, NULL ); babl_conversion_new ( - babl_type_id (BABL_U8_LUMA), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8_LUMA), + babl_type_from_id (BABL_DOUBLE), "plane", convert_u8_luma_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_U8_LUMA), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8_LUMA), "plane", convert_double_u8_luma, NULL ); babl_conversion_new ( - babl_type_id (BABL_U8_CHROMA), - babl_type_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8_CHROMA), + babl_type_from_id (BABL_DOUBLE), "plane", convert_u8_chroma_double, NULL ); babl_conversion_new ( - babl_type_id (BABL_DOUBLE), - babl_type_id (BABL_U8_CHROMA), + babl_type_from_id (BABL_DOUBLE), + babl_type_from_id (BABL_U8_CHROMA), "plane", convert_double_u8_chroma, NULL ); diff --git a/babl/base/util.h b/babl/base/util.h index fa2280c..7ccaf8f 100644 --- a/babl/base/util.h +++ b/babl/base/util.h @@ -22,6 +22,13 @@ #include #include +/* Alpha threshold used in the reference implementation for + * un-pre-multiplication of color data: + * + * 0.01 / (2^16 - 1) + */ +#define BABL_ALPHA_THRESHOLD 0.000000152590219 + #define BABL_PLANAR_SANITY \ { \ assert(src_bands>0); \ diff --git a/babl/gettimeofday.c b/babl/gettimeofday.c index 33bf926..6640abc 100644 --- a/babl/gettimeofday.c +++ b/babl/gettimeofday.c @@ -6,6 +6,7 @@ * By Wu Yongwei * */ +#include "config.h" #ifdef _WIN32 diff --git a/config.h.in b/config.h.in index 87cbb49..972b414 100644 --- a/config.h.in +++ b/config.h.in @@ -15,6 +15,15 @@ /* separator between directories in BABL_PATH */ #undef BABL_DIR_SEPARATOR +/* Define if the C pre-processor supports GNU style variadic macros */ +#undef BABL_GNUC_VARIADIC_MACROS + +/* Define if the C++ pre-processor supports variadic macros */ +#undef BABL_ISO_CXX_VARIADIC_MACROS + +/* Define if the C pre-processor supports variadic macros */ +#undef BABL_ISO_VARIADIC_MACROS + /* name of BABL library */ #undef BABL_LIBRARY @@ -24,9 +33,6 @@ /* Define to 1 if this is an unstable version of BABL */ #undef BABL_UNSTABLE -/* Dynamic shared library */ -#undef DYNAMICLIB - /* Define to 1 if you have the header file. */ #undef HAVE_ALTIVEC_H @@ -36,6 +42,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_DLFCN_H +/* Define to 1 if you have the header file. */ +#undef HAVE_DL_H + /* Define to 1 if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY diff --git a/configure b/configure index be981ed..78e2ff0 100755 --- a/configure +++ b/configure @@ -1,9 +1,9 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for babl 0.0.22. +# Generated by GNU Autoconf 2.63 for babl 0.1.0. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. ## --------------------- ## @@ -15,7 +15,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -37,17 +37,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -63,8 +91,6 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -87,7 +113,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -100,17 +126,10 @@ PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -132,7 +151,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -158,7 +177,7 @@ else as_have_required=no fi - if test $as_have_required = yes && (eval ": + if test $as_have_required = yes && (eval ": (as_func_return () { (exit \$1) } @@ -240,7 +259,7 @@ IFS=$as_save_IFS if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -261,7 +280,7 @@ _ASEOF if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -341,10 +360,10 @@ fi if test "x$CONFIG_SHELL" != x; then for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi @@ -413,9 +432,10 @@ fi test \$exitcode = 0") || { echo No shell found that supports shell functions. - echo Please tell autoconf@gnu.org about your system, - echo including any error possibly output before this - echo message + echo Please tell bug-autoconf@gnu.org about your system, + echo including any error possibly output before this message. + echo This can help us improve future autoconf versions. + echo Configuration will now proceed without shell functions. } @@ -451,7 +471,7 @@ test \$exitcode = 0") || { s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems @@ -479,7 +499,6 @@ case `echo -n x` in *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -492,19 +511,22 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -529,10 +551,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -726,8 +748,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='babl' PACKAGE_TARNAME='babl' -PACKAGE_VERSION='0.0.22' -PACKAGE_STRING='babl 0.0.22' +PACKAGE_VERSION='0.1.0' +PACKAGE_STRING='babl 0.1.0' PACKAGE_BUGREPORT='' ac_unique_file="babl/babl.h" @@ -767,161 +789,177 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL -PATH_SEPARATOR -PACKAGE_NAME -PACKAGE_TARNAME -PACKAGE_VERSION -PACKAGE_STRING -PACKAGE_BUGREPORT -exec_prefix -prefix -program_transform_name -bindir -sbindir -libexecdir -datarootdir -datadir -sysconfdir -sharedstatedir -localstatedir -includedir -oldincludedir -docdir -infodir -htmldir -dvidir -pdfdir -psdir -libdir -localedir -mandir -DEFS -ECHO_C -ECHO_N -ECHO_T -LIBS +ac_subst_vars='LTLIBOBJS +LIBOBJS +ALTIVEC_EXTRA_CFLAGS +SSE_EXTRA_CFLAGS +MMX_EXTRA_CFLAGS +OS_UNIX_FALSE +OS_UNIX_TRUE +OS_WIN32_FALSE +OS_WIN32_TRUE +MATH_LIB +DIR_SEP +PATH_SEP +PLATFORM_WIN32_FALSE +PLATFORM_WIN32_TRUE +SHREXT +HAVE_W3M_FALSE +HAVE_W3M_TRUE +W3M +HAVE_RSVG_FALSE +HAVE_RSVG_TRUE +RSVG +WEBSITE_LOCATION +WEBSITE_HOST +MAINT +MAINTAINER_MODE_FALSE +MAINTAINER_MODE_TRUE +LIBTOOL +ac_ct_F77 +FFLAGS +F77 +CXXCPP +am__fastdepCXX_FALSE +am__fastdepCXX_TRUE +CXXDEPMODE +ac_ct_CXX +CXXFLAGS +CXX +OBJDUMP +AS +DLLTOOL +NMEDIT +DSYMUTIL +RANLIB +AR +ECHO +LN_S +EGREP +GREP +SED +host_os +host_vendor +host_cpu +host +build_os +build_vendor +build_cpu +build +CPP +am__fastdepCC_FALSE +am__fastdepCC_TRUE +CCDEPMODE +AMDEPBACKSLASH +AMDEP_FALSE +AMDEP_TRUE +am__quote +am__include +DEPDIR +OBJEXT +EXEEXT +ac_ct_CC +CPPFLAGS +LDFLAGS +CFLAGS +CC +am__untar +am__tar +AMTAR +am__leading_dot +SET_MAKE +AWK +mkdir_p +MKDIR_P +INSTALL_STRIP_PROGRAM +STRIP +install_sh +MAKEINFO +AUTOHEADER +AUTOMAKE +AUTOCONF +ACLOCAL +VERSION +PACKAGE +CYGPATH_W +am__isrc +INSTALL_DATA +INSTALL_SCRIPT +INSTALL_PROGRAM +BABL_CURRENT_MINUS_AGE +BABL_LIBRARY_VERSION +BABL_UNSTABLE +BABL_UNSTABLE_FALSE +BABL_UNSTABLE_TRUE +BABL_RELEASE +BABL_API_VERSION +BABL_REAL_VERSION +BABL_VERSION +BABL_BINARY_AGE +BABL_INTERFACE_AGE +BABL_MICRO_VERSION +BABL_MINOR_VERSION +BABL_MAJOR_VERSION +target_alias +host_alias build_alias +LIBS +ECHO_T +ECHO_N +ECHO_C +DEFS +mandir +localedir +libdir +psdir +pdfdir +dvidir +htmldir +infodir +docdir +oldincludedir +includedir +localstatedir +sharedstatedir +sysconfdir +datadir +datarootdir +libexecdir +sbindir +bindir +program_transform_name +prefix +exec_prefix +PACKAGE_BUGREPORT +PACKAGE_STRING +PACKAGE_VERSION +PACKAGE_TARNAME +PACKAGE_NAME +PATH_SEPARATOR +SHELL' +ac_subst_files='' +ac_user_opts=' +enable_option_checking +enable_dependency_tracking +enable_static +enable_shared +enable_fast_install +with_gnu_ld +enable_libtool_lock +with_pic +with_tags +enable_maintainer_mode +enable_mmx +enable_sse +enable_altivec +' + ac_precious_vars='build_alias host_alias target_alias -BABL_MAJOR_VERSION -BABL_MINOR_VERSION -BABL_MICRO_VERSION -BABL_INTERFACE_AGE -BABL_BINARY_AGE -BABL_VERSION -BABL_REAL_VERSION -BABL_API_VERSION -BABL_RELEASE -BABL_UNSTABLE_TRUE -BABL_UNSTABLE_FALSE -BABL_UNSTABLE -BABL_LIBRARY_VERSION -BABL_CURRENT_MINUS_AGE -INSTALL_PROGRAM -INSTALL_SCRIPT -INSTALL_DATA -CYGPATH_W -PACKAGE -VERSION -ACLOCAL -AUTOCONF -AUTOMAKE -AUTOHEADER -MAKEINFO -install_sh -STRIP -INSTALL_STRIP_PROGRAM -mkdir_p -AWK -SET_MAKE -am__leading_dot -AMTAR -am__tar -am__untar CC CFLAGS LDFLAGS -CPPFLAGS -ac_ct_CC -EXEEXT -OBJEXT -DEPDIR -am__include -am__quote -AMDEP_TRUE -AMDEP_FALSE -AMDEPBACKSLASH -CCDEPMODE -am__fastdepCC_TRUE -am__fastdepCC_FALSE -build -build_cpu -build_vendor -build_os -host -host_cpu -host_vendor -host_os -SED -GREP -EGREP -LN_S -ECHO -AR -RANLIB -DSYMUTIL -NMEDIT -DLLTOOL -AS -OBJDUMP -CPP -CXX -CXXFLAGS -ac_ct_CXX -CXXDEPMODE -am__fastdepCXX_TRUE -am__fastdepCXX_FALSE -CXXCPP -F77 -FFLAGS -ac_ct_F77 -LIBTOOL -MAINTAINER_MODE_TRUE -MAINTAINER_MODE_FALSE -MAINT -WEBSITE_HOST -WEBSITE_LOCATION -INKSCAPE -HAVE_INKSCAPE_TRUE -HAVE_INKSCAPE_FALSE -W3M -HAVE_W3M_TRUE -HAVE_W3M_FALSE -SHREXT -DYNAMICLIB -PLATFORM_WIN32_TRUE -PLATFORM_WIN32_FALSE -PATH_SEP -DIR_SEP -MATH_LIB -OS_WIN32_TRUE -OS_WIN32_FALSE -OS_UNIX_TRUE -OS_UNIX_FALSE -MMX_EXTRA_CFLAGS -SSE_EXTRA_CFLAGS -ALTIVEC_EXTRA_CFLAGS -LIBOBJS -LTLIBOBJS' -ac_subst_files='' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS +LIBS CPPFLAGS CPP CXX @@ -935,6 +973,8 @@ FFLAGS' # Initialize some variables set by options. ac_init_help= ac_init_version=false +ac_unrecognized_opts= +ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -1033,13 +1073,21 @@ do datarootdir=$ac_optarg ;; -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=no ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=no ;; -docdir | --docdir | --docdi | --doc | --do) ac_prev=docdir ;; @@ -1052,13 +1100,21 @@ do dvidir=$ac_optarg ;; -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` - eval enable_$ac_feature=\$ac_optarg ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"enable_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval enable_$ac_useropt=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1249,22 +1305,38 @@ do ac_init_version=: ;; -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=\$ac_optarg ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=\$ac_optarg ;; -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 + expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && + { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/[-.]/_/g'` - eval with_$ac_package=no ;; + ac_useropt_orig=$ac_useropt + ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` + case $ac_user_opts in + *" +"with_$ac_useropt" +"*) ;; + *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" + ac_unrecognized_sep=', ';; + esac + eval with_$ac_useropt=no ;; --x) # Obsolete; use --with-x. @@ -1284,7 +1356,7 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { echo "$as_me: error: unrecognized option: $ac_option + -*) { $as_echo "$as_me: error: unrecognized option: $ac_option Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -1293,16 +1365,16 @@ Try \`$0 --help' for more information." >&2 ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 { (exit 1); exit 1; }; } eval $ac_envvar=\$ac_optarg export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1311,22 +1383,38 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 + { $as_echo "$as_me: error: missing argument to $ac_option" >&2 { (exit 1); exit 1; }; } fi -# Be sure to have absolute directory names. +if test -n "$ac_unrecognized_opts"; then + case $enable_option_checking in + no) ;; + fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 + { (exit 1); exit 1; }; } ;; + *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; + esac +fi + +# Check all directory arguments for consistency. for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ libdir localedir mandir do eval ac_val=\$$ac_var + # Remove trailing slashes. + case $ac_val in + */ ) + ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` + eval $ac_var=\$ac_val;; + esac + # Be sure to have absolute directory names. case $ac_val in [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; } done @@ -1341,7 +1429,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1357,10 +1445,10 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { echo "$as_me: error: Working directory cannot be determined" >&2 + { $as_echo "$as_me: error: working directory cannot be determined" >&2 { (exit 1); exit 1; }; } test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { echo "$as_me: error: pwd does not report name of working directory" >&2 + { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 { (exit 1); exit 1; }; } @@ -1368,12 +1456,12 @@ test "X$ac_ls_di" = "X$ac_pwd_ls_di" || if test -z "$srcdir"; then ac_srcdir_defaulted=yes # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$0" || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X"$0" | + ac_confdir=`$as_dirname -- "$as_myself" || +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_myself" : 'X\(//\)[^/]' \| \ + X"$as_myself" : 'X\(//\)$' \| \ + X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_myself" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -1400,12 +1488,12 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 { (exit 1); exit 1; }; } pwd)` # When building in place, set srcdir=. @@ -1432,7 +1520,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures babl 0.0.22 to adapt to many kinds of systems. +\`configure' configures babl 0.1.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1454,9 +1542,9 @@ Configuration: Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1466,25 +1554,25 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/babl] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/babl] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] _ACEOF cat <<\_ACEOF @@ -1502,16 +1590,17 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of babl 0.0.22:";; + short | recursive ) echo "Configuration of babl 0.1.0:";; esac cat <<\_ACEOF Optional Features: + --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-static[=PKGS] build static libraries [default=no] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors + --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] @@ -1555,15 +1644,17 @@ fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || continue + test -d "$ac_dir" || + { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || + continue ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -1599,7 +1690,7 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix echo && $SHELL "$ac_srcdir/configure" --help=recursive else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi || ac_status=$? cd "$ac_pwd" || { ac_status=$?; break; } done @@ -1608,11 +1699,11 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -babl configure 0.0.22 -generated by GNU Autoconf 2.61 +babl configure 0.1.0 +generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1622,8 +1713,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by babl $as_me 0.0.22, which was -generated by GNU Autoconf 2.61. Invocation command line was +It was created by babl $as_me 0.1.0, which was +generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -1659,7 +1750,7 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" + $as_echo "PATH: $as_dir" done IFS=$as_save_IFS @@ -1694,7 +1785,7 @@ do | -silent | --silent | --silen | --sile | --sil) continue ;; *\'*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; @@ -1746,11 +1837,12 @@ _ASBOX case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -1780,9 +1872,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo @@ -1797,9 +1889,9 @@ _ASBOX do eval ac_val=\$$ac_var case $ac_val in - *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; esac - echo "$ac_var='\''$ac_val'\''" + $as_echo "$ac_var='\''$ac_val'\''" done | sort echo fi @@ -1815,8 +1907,8 @@ _ASBOX echo fi test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" + $as_echo "$as_me: caught signal $ac_signal" + $as_echo "$as_me: exit $exit_status" } >&5 rm -f core *.core core.conftest.* && rm -f -r conftest* confdefs* conf$$* $ac_clean_files && @@ -1858,21 +1950,24 @@ _ACEOF # Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. +# Prefer an explicitly selected file to automatically selected ones. +ac_site_file1=NONE +ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - set x "$CONFIG_SITE" + ac_site_file1=$CONFIG_SITE elif test "x$prefix" != xNONE; then - set x "$prefix/share/config.site" "$prefix/etc/config.site" + ac_site_file1=$prefix/share/config.site + ac_site_file2=$prefix/etc/config.site else - set x "$ac_default_prefix/share/config.site" \ - "$ac_default_prefix/etc/config.site" + ac_site_file1=$ac_default_prefix/share/config.site + ac_site_file2=$ac_default_prefix/etc/config.site fi -shift -for ac_site_file +for ac_site_file in "$ac_site_file1" "$ac_site_file2" do + test "x$ac_site_file" = xNONE && continue if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} + { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +$as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi @@ -1882,16 +1977,16 @@ if test -r "$cache_file"; then # Some versions of bash will fail to source /dev/null (special # files actually), so we avoid doing that. if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 +$as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; *) . "./$cache_file";; esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 +$as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1905,29 +2000,38 @@ for ac_var in $ac_precious_vars; do eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: + # differences in whitespace do not lead to failure. + ac_old_val_w=`echo x $ac_old_val` + ac_new_val_w=`echo x $ac_new_val` + if test "$ac_old_val_w" != "$ac_new_val_w"; then + { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + ac_cache_corrupted=: + else + { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} + eval $ac_var=\$ac_old_val + fi + { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 +$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} + { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 +$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in @@ -1937,10 +2041,12 @@ echo "$as_me: current value: $ac_new_val" >&2;} fi done if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} + { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -1978,12 +2084,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu BABL_MAJOR_VERSION=0 -BABL_MINOR_VERSION=0 -BABL_MICRO_VERSION=22 +BABL_MINOR_VERSION=1 +BABL_MICRO_VERSION=0 BABL_INTERFACE_AGE=0 -BABL_BINARY_AGE=22 -BABL_VERSION=0.0.22 -BABL_REAL_VERSION=0.0.22 +BABL_BINARY_AGE=100 +BABL_VERSION=0.1.0 +BABL_REAL_VERSION=0.1.0 BABL_API_VERSION=0.0 @@ -1998,7 +2104,7 @@ BABL_RELEASE=0.0 -BABL_UNSTABLE=no +BABL_UNSTABLE=yes if test "x$BABL_UNSTABLE" = "xyes"; then cat >>confdefs.h <<\_ACEOF @@ -2006,9 +2112,7 @@ cat >>confdefs.h <<\_ACEOF _ACEOF fi - - -if test "x$GEGL_UNSTABLE" = "xyes"; then + if test "x$GEGL_UNSTABLE" = "xyes"; then BABL_UNSTABLE_TRUE= BABL_UNSTABLE_FALSE='#' else @@ -2023,7 +2127,7 @@ fi -BABL_LIBRARY_VERSION="22:0:22" +BABL_LIBRARY_VERSION="100:0:100" BABL_CURRENT_MINUS_AGE=0 @@ -2033,7 +2137,8 @@ PACKAGE_NAME=babl -am__api_version="1.9" +am__api_version='1.10' + ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do if test -f "$ac_dir/install-sh"; then @@ -2051,8 +2156,8 @@ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} { (exit 1); exit 1; }; } fi @@ -2078,11 +2183,12 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +# Reject install programs that cannot install multiple files. +{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +$as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -2111,17 +2217,29 @@ case $as_dir/ in # program-specific install script used by HP pwplus--don't use. : else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 + rm -rf conftest.one conftest.two conftest.dir + echo one > conftest.one + echo two > conftest.two + mkdir conftest.dir + if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && + test -s conftest.one && test -s conftest.two && + test -s conftest.dir/conftest.one && + test -s conftest.dir/conftest.two + then + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi fi fi done done ;; esac + done IFS=$as_save_IFS +rm -rf conftest.one conftest.two conftest.dir fi if test "${ac_cv_path_install+set}" = set; then @@ -2134,8 +2252,8 @@ fi INSTALL=$ac_install_sh fi fi -{ echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6; } +{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +$as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. @@ -2145,8 +2263,8 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -2169,9 +2287,9 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} { (exit 1); exit 1; }; } fi @@ -2182,26 +2300,23 @@ then # Ok. : else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! +$as_echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. test "$program_suffix" != NONE && program_transform_name="s&\$&$program_suffix&;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. +# Double any \ or $. # By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm -f conftest.sed +ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' +program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` @@ -2212,51 +2327,66 @@ if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 -echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} -fi - -if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - # We used to keeping the `.' as first argument, in order to - # allow $(mkdir_p) to be used without argument. As in - # $(mkdir_p) $(somedir) - # where $(somedir) is conditionally defined. However this is wrong - # for two reasons: - # 1. if the package is installed by a user who cannot write `.' - # make install will fail, - # 2. the above comment should most certainly read - # $(mkdir_p) $(DESTDIR)$(somedir) - # so it does not work when $(somedir) is undefined and - # $(DESTDIR) is not. - # To support the latter case, we have to write - # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir), - # so the `.' trick is pointless. - mkdir_p='mkdir -p --' -else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - for d in ./-p ./--version; - do - test -d $d && rmdir $d - done - # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. - if test -f "$ac_aux_dir/mkinstalldirs"; then - mkdir_p='$(mkinstalldirs)' + { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" else - mkdir_p='$(install_sh) -d' + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" fi fi +{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +$as_echo "$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AWK+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -2269,7 +2399,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2280,22 +2410,23 @@ fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { echo "$as_me:$LINENO: result: $AWK" >&5 -echo "${ECHO_T}$AWK" >&6; } + { $as_echo "$as_me:$LINENO: result: $AWK" >&5 +$as_echo "$AWK" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi test -n "$AWK" && break done -{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } -set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } +set x ${MAKE-make} +ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF SHELL = /bin/sh @@ -2312,12 +2443,12 @@ esac rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } SET_MAKE= else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2330,12 +2461,16 @@ else fi rmdir .tst 2>/dev/null -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} { (exit 1); exit 1; }; } + fi fi # test whether we have cygpath @@ -2350,7 +2485,7 @@ fi # Define the identity of the package. PACKAGE='babl' - VERSION='0.0.22' + VERSION='0.1.0' # Some tools Automake needs. @@ -2369,7 +2504,7 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"$am_aux_dir/install-sh"} +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} # Installed binaries are usually stripped using `strip' when the user # run `make install-strip'. However `strip' might not be the right @@ -2379,10 +2514,10 @@ if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -2395,7 +2530,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2406,11 +2541,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2419,10 +2554,10 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -2435,7 +2570,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2446,11 +2581,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -2458,12 +2593,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -2473,7 +2604,7 @@ else fi fi -INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -2490,29 +2621,66 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' ac_config_headers="$ac_config_headers config.h" -# Check whether --enable-static was given. -if test "${enable_static+set}" = set; then - enableval=$enable_static; p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=no +DEPDIR="${am__leading_dot}deps" + +ac_config_commands="$ac_config_commands depfiles" + + +am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo done +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi + + +{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf + +# Check whether --enable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval=$enable_dependency_tracking; fi +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi + if test "x$enable_dependency_tracking" != xno; then + AMDEP_TRUE= + AMDEP_FALSE='#' +else + AMDEP_TRUE='#' + AMDEP_FALSE= +fi ac_ext=c @@ -2523,10 +2691,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2539,7 +2707,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2550,11 +2718,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2563,10 +2731,10 @@ if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2579,7 +2747,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2590,11 +2758,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_CC" = x; then @@ -2602,12 +2770,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2620,10 +2784,10 @@ if test -z "$CC"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2636,7 +2800,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2647,11 +2811,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2660,10 +2824,10 @@ fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2681,7 +2845,7 @@ do continue fi ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2704,11 +2868,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2719,10 +2883,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -2735,7 +2899,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2746,11 +2910,11 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2763,10 +2927,10 @@ if test -z "$CC"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -2779,7 +2943,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -2790,11 +2954,11 @@ fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -2806,12 +2970,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC @@ -2821,44 +2981,50 @@ fi fi -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF @@ -2877,27 +3043,22 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -# -# List of possible output files, starting from the most likely. -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) -# only as a last resort. b.out is created by i960 compilers. -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' -# -# The IRIX 6 linker writes into existing files which may not be -# executable, retaining their permissions. Remove them first so a -# subsequent execution test works. +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` + +# The possible output files: +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" + ac_rmfiles= for ac_file in $ac_files do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; * ) ac_rmfiles="$ac_rmfiles $ac_file";; esac done @@ -2908,10 +3069,11 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' @@ -2922,7 +3084,7 @@ for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; [ab].out ) # We found the default executable, but exeext='' is most @@ -2949,25 +3111,27 @@ else ac_file='' fi -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } if test -z "$ac_file"; then - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables +$as_echo "$as_me: error: C compiler cannot create executables See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } + { (exit 77); exit 77; }; }; } fi ac_exeext=$ac_cv_exeext # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then @@ -2976,49 +3140,53 @@ if test "$cross_compiling" != yes; then *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. +$as_echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi fi fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } -rm -f a.out a.exe conftest$ac_cv_exeext b.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save # Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } if { (ac_try="$ac_link" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -3027,31 +3195,33 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` break;; * ) break;; esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi rm -f conftest$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +$as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +$as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3074,40 +3244,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +$as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -3133,20 +3306,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -3156,15 +3330,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } -GCC=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes @@ -3191,20 +3369,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CFLAGS="" @@ -3229,20 +3408,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_c_werror_flag=$ac_save_c_werror_flag @@ -3268,20 +3448,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3296,8 +3477,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -3313,10 +3494,10 @@ else CFLAGS= fi fi -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } if test "${ac_cv_prog_cc_c89+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC @@ -3387,20 +3568,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cc_c89=$ac_arg else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -3416,15 +3598,15 @@ fi # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6; } ;; + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; xno) - { echo "$as_me:$LINENO: result: unsupported" >&5 -echo "${ECHO_T}unsupported" >&6; } ;; + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac @@ -3433,78 +3615,1213 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -DEPDIR="${am__leading_dot}deps" -ac_config_commands="$ac_config_commands depfiles" +depcc="$CC" am_compiler_list= +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo done -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 -echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; } -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi -fi + am_cv_CC_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` + fi + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_CC_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_CC_dependencies_compiler_type=none +fi + +fi +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type + + if + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then + am__fastdepCC_TRUE= + am__fastdepCC_FALSE='#' +else + am__fastdepCC_TRUE='#' + am__fastdepCC_FALSE= +fi + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +$as_echo_n "checking how to run the C preprocessor... " >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +$as_echo "$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } +fi + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + +{ $as_echo "$as_me:$LINENO: checking for GNUC variadic macros" >&5 +$as_echo_n "checking for GNUC variadic macros... " >&6; } +if test "${babl_cv_prog_gnuc_variadic_macros+set}" = set; then + $as_echo_n "(cached) " >&6 +else + # gcc-2.95.x supports both gnu style and ISO varargs, but if -ansi + # is passed ISO vararg support is turned off, and there is no work + # around to turn it on, so we unconditionally turn it off. + { echo '#if __GNUC__ == 2 && __GNUC_MINOR__ == 95' + echo ' yes ' + echo '#endif'; } > conftest.c + if ${CPP} conftest.c | grep yes > /dev/null; then + babl_cv_prog_c_variadic_macros=no + babl_cv_prog_cxx_variadic_macros=no + fi + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +int a(int p1, int p2, int p3); +#define call_a(params...) a(1,params) +call_a(2,3); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + babl_cv_prog_gnuc_variadic_macros=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + babl_cv_prog_gnuc_variadic_macros=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:$LINENO: result: $babl_cv_prog_gnuc_variadic_macros" >&5 +$as_echo "$babl_cv_prog_gnuc_variadic_macros" >&6; } +if test x$babl_cv_prog_gnuc_variadic_macros = xyes; then + +cat >>confdefs.h <<\_ACEOF +#define BABL_GNUC_VARIADIC_MACROS 1 +_ACEOF + +fi + +{ $as_echo "$as_me:$LINENO: checking for ISO C99 variadic macros in C" >&5 +$as_echo_n "checking for ISO C99 variadic macros in C... " >&6; } +if test "${babl_cv_prog_c_variadic_macros+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +int a(int p1, int p2, int p3); +#define call_a(...) a(1,__VA_ARGS__) +call_a(2,3); + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + babl_cv_prog_c_variadic_macros=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + babl_cv_prog_c_variadic_macros=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:$LINENO: result: $babl_cv_prog_c_variadic_macros" >&5 +$as_echo "$babl_cv_prog_c_variadic_macros" >&6; } +if test x$babl_cv_prog_c_variadic_macros = xyes ; then + +cat >>confdefs.h <<\_ACEOF +#define BABL_ISO_VARIADIC_MACROS 1 +_ACEOF + +fi + +# No C++ compiler + babl_cv_prog_cxx_variadic_macros=no +if test x$babl_cv_prog_cxx_variadic_macros = xyes ; then + +cat >>confdefs.h <<\_ACEOF +#define BABL_ISO_CXX_VARIADIC_MACROS 1 +_ACEOF + +fi + + +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then + enableval=$enable_static; p=${PACKAGE-default} + case $enableval in + yes) enable_static=yes ;; + no) enable_static=no ;; + *) + enable_static=no + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for pkg in $enableval; do + IFS="$lt_save_ifs" + if test "X$pkg" = "X$p"; then + enable_static=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac +else + enable_static=no +fi + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. +set dummy gcc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + fi +fi +if test -z "$CC"; then + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + ac_prog_rejected=no +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +if test $ac_prog_rejected = yes; then + # We found a bogon in the path, so make sure we never use it. + set dummy $ac_cv_prog_CC + shift + if test $# != 0; then + # We chose a different compiler from the bogus one. + # However, it has the same basename, so the bogon will be chosen + # first if we set CC to just the basename; use the full file name. + shift + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" + fi +fi +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { $as_echo "$as_me:$LINENO: result: $CC" >&5 +$as_echo "$CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +$as_echo "$ac_ct_CC" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + + test -n "$ac_ct_CC" && break +done + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi + +fi + + +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; }; } + +# Provide some information about the compiler. +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +set X $ac_compile +ac_compiler=$2 +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then + $as_echo_n "(cached) " >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -{ echo "$as_me:$LINENO: result: $_am_result" >&5 -echo "${ECHO_T}$_am_result" >&6; } -rm -f confinc confmf + ac_compiler_gnu=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then - enableval=$enable_dependency_tracking; fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +$as_echo "$ac_cv_c_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GCC=yes +else + GCC= +fi +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +$as_echo_n "checking whether $CC accepts -g... " >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi -if test "x$enable_dependency_tracking" != xno; then - AMDEP_TRUE= - AMDEP_FALSE='#' +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +$as_echo "$ac_cv_prog_cc_g" >&6; } +if test "$ac_test_CFLAGS" = set; then + CFLAGS=$ac_save_CFLAGS +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + CFLAGS="-g -O2" + else + CFLAGS="-g" + fi else - AMDEP_TRUE='#' - AMDEP_FALSE= + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi +fi +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} + +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { $as_echo "$as_me:$LINENO: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:$LINENO: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; +esac +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu depcc="$CC" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -3566,6 +4883,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -3591,13 +4909,11 @@ else fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then am__fastdepCC_TRUE= @@ -3660,34 +4976,34 @@ fi # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking build system type" >&5 +$as_echo_n "checking build system type... " >&6; } if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +$as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -echo "$as_me: error: invalid value of canonical build" >&2;} +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +$as_echo "$as_me: error: invalid value of canonical build" >&2;} { (exit 1); exit 1; }; };; esac build=$ac_cv_build @@ -3704,27 +5020,27 @@ IFS=$ac_save_IFS case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking host system type" >&5 +$as_echo_n "checking host system type... " >&6; } if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} { (exit 1); exit 1; }; } fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +$as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -echo "$as_me: error: invalid value of canonical host" >&2;} +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +$as_echo "$as_me: error: invalid value of canonical host" >&2;} { (exit 1); exit 1; }; };; esac host=$ac_cv_host @@ -3741,10 +5057,10 @@ IFS=$ac_save_IFS case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 +$as_echo_n "checking for a sed that does not truncate output... " >&6; } if test "${lt_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else # Loop through the user's path and test for sed and gsed. # Then use that list of sed's as ones to test for truncation. @@ -3797,45 +5113,40 @@ fi SED=$lt_cv_path_SED -{ echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6; } +{ $as_echo "$as_me:$LINENO: result: $SED" >&5 +$as_echo "$SED" >&6; } -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } -if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Extract the first word of "grep ggrep" to use in msg output -if test -z "$GREP"; then -set dummy grep ggrep; ac_prog_name=$2 +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; } if test "${ac_cv_path_GREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else + if test -z "$GREP"; then ac_path_GREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue - # Check for GNU ac_path_GREP and select it if it is found. + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue +# Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in *GNU*) ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'GREP' >> "conftest.nl" + $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` @@ -3850,74 +5161,60 @@ case `"$ac_path_GREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_GREP_found && break 3 + $ac_path_GREP_found && break 3 + done done done - -done IFS=$as_save_IFS - - -fi - -GREP="$ac_cv_path_GREP" -if test -z "$GREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + if test -z "$ac_cv_path_GREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} { (exit 1); exit 1; }; } -fi - + fi else ac_cv_path_GREP=$GREP fi - fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +$as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +$as_echo_n "checking for egrep... " >&6; } if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 then ac_cv_path_EGREP="$GREP -E" else - # Extract the first word of "egrep" to use in msg output -if test -z "$EGREP"; then -set dummy egrep; ac_prog_name=$2 -if test "${ac_cv_path_EGREP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else + if test -z "$EGREP"; then ac_path_EGREP_found=false -# Loop through the user's path and test for each of PROGNAME-LIST -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + # Loop through the user's path and test for each of PROGNAME-LIST + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue - # Check for GNU ac_path_EGREP and select it if it is found. + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue +# Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in *GNU*) ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; *) ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + $as_echo_n 0123456789 >"conftest.in" while : do cat "conftest.in" "conftest.in" >"conftest.tmp" mv "conftest.tmp" "conftest.in" cp "conftest.in" "conftest.nl" - echo 'EGREP' >> "conftest.nl" + $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break ac_count=`expr $ac_count + 1` @@ -3932,33 +5229,24 @@ case `"$ac_path_EGREP" --version 2>&1` in rm -f conftest.in conftest.tmp conftest.nl conftest.out;; esac - - $ac_path_EGREP_found && break 3 + $ac_path_EGREP_found && break 3 + done done done - -done IFS=$as_save_IFS - - -fi - -EGREP="$ac_cv_path_EGREP" -if test -z "$EGREP"; then - { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + if test -z "$ac_cv_path_EGREP"; then + { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} { (exit 1); exit 1; }; } -fi - + fi else ac_cv_path_EGREP=$EGREP fi - fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +$as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" @@ -3973,8 +5261,8 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -4003,14 +5291,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR @@ -4040,19 +5328,19 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } + { $as_echo "$as_me:$LINENO: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld -{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 +$as_echo_n "checking for $LD option to reload object files... " >&6; } if test "${lt_cv_ld_reload_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_ld_reload_flag='-r' fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 +$as_echo "$lt_cv_ld_reload_flag" >&6; } reload_flag=$lt_cv_ld_reload_flag case $reload_flag in "" | " "*) ;; @@ -4094,10 +5382,10 @@ case $host_os in ;; esac -{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 +$as_echo_n "checking for BSD-compatible nm... " >&6; } if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$NM"; then # Let the user override the test. @@ -4143,25 +5431,25 @@ else test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm fi fi -{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 +$as_echo "$lt_cv_path_NM" >&6; } NM="$lt_cv_path_NM" -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5 +$as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s if test "$LN_S" = "ln -s"; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6; } + { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5 +$as_echo "no, using $LN_S" >&6; } fi -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5 +$as_echo_n "checking how to recognize dependent libraries... " >&6; } if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_file_magic_cmd='$MAGIC_CMD' lt_cv_file_magic_test_file= @@ -4273,7 +5561,7 @@ linux* | k*bsd*-gnu) lt_cv_deplibs_check_method=pass_all ;; -netbsd* | netbsdelf*-gnu) +netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -4344,8 +5632,8 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) esac fi -{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 +$as_echo "$lt_cv_deplibs_check_method" >&6; } file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method test -z "$deplibs_check_method" && deplibs_check_method=unknown @@ -4362,7 +5650,6 @@ LTCFLAGS=${LTCFLAGS-"$CFLAGS"} # Allow CC to be a program name with arguments. compiler=$CC - # Check whether --enable-libtool-lock was given. if test "${enable_libtool_lock+set}" = set; then enableval=$enable_libtool_lock; @@ -4379,7 +5666,7 @@ ia64-*-hpux*) if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then case `/usr/bin/file conftest.$ac_objext` in *ELF-32*) @@ -4394,11 +5681,11 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4397 "configure"' > conftest.$ac_ext + echo '#line 5684 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then if test "$lt_cv_prog_gnu_ld" = yes; then case `/usr/bin/file conftest.$ac_objext` in @@ -4436,7 +5723,7 @@ s390*-*linux*|sparc*-*linux*) if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then case `/usr/bin/file conftest.o` in *32-bit*) @@ -4459,6 +5746,7 @@ s390*-*linux*|sparc*-*linux*) esac ;; *64-bit*) + libsuff=64 case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" @@ -4486,10 +5774,10 @@ s390*-*linux*|sparc*-*linux*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" - { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; } if test "${lt_cv_cc_needs_belf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4518,26 +5806,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then lt_cv_cc_needs_belf=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 lt_cv_cc_needs_belf=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext ac_ext=c @@ -4547,8 +5839,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 +$as_echo "$lt_cv_cc_needs_belf" >&6; } if test x"$lt_cv_cc_needs_belf" != x"yes"; then # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf CFLAGS="$SAVE_CFLAGS" @@ -4560,7 +5852,7 @@ sparc*-*solaris*) if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then case `/usr/bin/file conftest.o` in *64-bit*) @@ -4582,10 +5874,10 @@ sparc*-*solaris*) if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$DLLTOOL"; then ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. @@ -4598,7 +5890,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4609,11 +5901,11 @@ fi fi DLLTOOL=$ac_cv_prog_DLLTOOL if test -n "$DLLTOOL"; then - { echo "$as_me:$LINENO: result: $DLLTOOL" >&5 -echo "${ECHO_T}$DLLTOOL" >&6; } + { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4622,10 +5914,10 @@ if test -z "$ac_cv_prog_DLLTOOL"; then ac_ct_DLLTOOL=$DLLTOOL # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DLLTOOL"; then ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. @@ -4638,7 +5930,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4649,11 +5941,11 @@ fi fi ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL if test -n "$ac_ct_DLLTOOL"; then - { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_DLLTOOL" = x; then @@ -4661,12 +5953,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DLLTOOL=$ac_ct_DLLTOOL @@ -4678,10 +5966,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$AS"; then ac_cv_prog_AS="$AS" # Let the user override the test. @@ -4694,7 +5982,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AS="${ac_tool_prefix}as" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -4705,11 +5993,11 @@ fi fi AS=$ac_cv_prog_AS if test -n "$AS"; then - { echo "$as_me:$LINENO: result: $AS" >&5 -echo "${ECHO_T}$AS" >&6; } + { $as_echo "$as_me:$LINENO: result: $AS" >&5 +$as_echo "$AS" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -4718,397 +6006,159 @@ if test -z "$ac_cv_prog_AS"; then ac_ct_AS=$AS # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_AS+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AS"; then ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AS="as" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_AS=$ac_cv_prog_ac_ct_AS -if test -n "$ac_ct_AS"; then - { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 -echo "${ECHO_T}$ac_ct_AS" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_AS" = x; then - AS="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - AS=$ac_ct_AS - fi -else - AS="$ac_cv_prog_AS" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { echo "$as_me:$LINENO: result: $OBJDUMP" >&5 -echo "${ECHO_T}$OBJDUMP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - - ;; - -esac - -need_locks="$enable_libtool_lock" - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi - -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_AS="as" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - # Passes both tests. -ac_preproc_ok=: -break +fi +fi +ac_ct_AS=$ac_cv_prog_ac_ct_AS +if test -n "$ac_ct_AS"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5 +$as_echo "$ac_ct_AS" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest.err conftest.$ac_ext + if test "x$ac_ct_AS" = x; then + AS="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AS=$ac_ct_AS + fi +else + AS="$ac_cv_prog_AS" +fi + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_OBJDUMP+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break +done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - done - ac_cv_prog_CPP=$CPP fi - CPP=$ac_cv_prog_CPP +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then + $as_echo_n "(cached) " >&6 else - ac_cv_prog_CPP=$CPP -fi -{ echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6; } -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS - # Broken: fails on valid input. -continue +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - # Broken: success on invalid input. -continue + OBJDUMP=$ac_ct_OBJDUMP + fi else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break + OBJDUMP="$ac_cv_prog_OBJDUMP" fi -rm -f conftest.err conftest.$ac_ext + ;; -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi +esac -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +need_locks="$enable_libtool_lock" -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } + +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5135,20 +6185,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no @@ -5240,37 +6291,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi +rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -5292,11 +6346,11 @@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5314,20 +6368,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then eval "$as_ac_Header=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_Header=no" @@ -5335,12 +6390,15 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_Header'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -5351,20 +6409,21 @@ done for ac_header in dlfcn.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5380,32 +6439,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -5419,69 +6479,73 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -5502,10 +6566,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -5518,7 +6582,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5529,11 +6593,11 @@ fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6; } + { $as_echo "$as_me:$LINENO: result: $CXX" >&5 +$as_echo "$CXX" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5546,10 +6610,10 @@ if test -z "$CXX"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -5562,7 +6626,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -5573,11 +6637,11 @@ fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +$as_echo "$ac_ct_CXX" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -5589,12 +6653,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CXX=$ac_ct_CXX @@ -5604,43 +6664,47 @@ fi fi fi # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` +$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5 +set X $ac_compile +ac_compiler=$2 { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -5666,20 +6730,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -5689,15 +6754,19 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; } -GXX=`test $ac_compiler_gnu = yes && echo yes` +{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } +if test $ac_compiler_gnu = yes; then + GXX=yes +else + GXX= +fi ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +$as_echo_n "checking whether $CXX accepts -g... " >&6; } if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag ac_cxx_werror_flag=yes @@ -5724,20 +6793,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 CXXFLAGS="" @@ -5762,20 +6832,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cxx_werror_flag=$ac_save_cxx_werror_flag @@ -5801,20 +6872,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_cxx_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 @@ -5829,8 +6901,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cxx_werror_flag=$ac_save_cxx_werror_flag fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +$as_echo "$ac_cv_prog_cxx_g" >&6; } if test "$ac_test_CXXFLAGS" = set; then CXXFLAGS=$ac_save_CXXFLAGS elif test $ac_cv_prog_cxx_g = yes; then @@ -5854,10 +6926,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu depcc="$CXX" am_compiler_list= -{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 -echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +$as_echo_n "checking dependency style of $depcc... " >&6; } if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then # We make a subdir and do the tests there. Otherwise we can end up @@ -5919,6 +6991,7 @@ else depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then @@ -5944,13 +7017,11 @@ else fi fi -{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 -echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; } +{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5 +$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; } CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type - - -if + if test "x$enable_dependency_tracking" != xno \ && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then am__fastdepCXX_TRUE= @@ -5971,11 +7042,11 @@ ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +$as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded for CXXCPP in "$CXX -E" "/lib/cpp" @@ -6007,20 +7078,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -6044,13 +7116,14 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err @@ -6058,7 +7131,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -6083,8 +7156,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -{ echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6; } +{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5 +$as_echo "$CXXCPP" >&6; } ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -6112,20 +7185,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err }; then : else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Broken: fails on valid input. @@ -6149,13 +7223,14 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || test ! -s conftest.err @@ -6163,7 +7238,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 # Broken: success on invalid input. continue else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 # Passes both tests. @@ -6179,11 +7254,13 @@ rm -f conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } + { (exit 1); exit 1; }; }; } fi ac_ext=cpp @@ -6204,10 +7281,10 @@ if test -n "$ac_tool_prefix"; then do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$F77"; then ac_cv_prog_F77="$F77" # Let the user override the test. @@ -6220,7 +7297,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6231,11 +7308,11 @@ fi fi F77=$ac_cv_prog_F77 if test -n "$F77"; then - { echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6; } + { $as_echo "$as_me:$LINENO: result: $F77" >&5 +$as_echo "$F77" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6248,10 +7325,10 @@ if test -z "$F77"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_F77"; then ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. @@ -6264,7 +7341,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_F77="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6275,11 +7352,11 @@ fi fi ac_ct_F77=$ac_cv_prog_ac_ct_F77 if test -n "$ac_ct_F77"; then - { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 +$as_echo "$ac_ct_F77" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6291,12 +7368,8 @@ done else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac F77=$ac_ct_F77 @@ -6305,37 +7378,41 @@ fi # Provide some information about the compiler. -echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` +$as_echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5 +set X $ac_compile +ac_compiler=$2 { (ac_try="$ac_compiler --version >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler --version >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -v >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -v >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } { (ac_try="$ac_compiler -V >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compiler -V >&5") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } rm -f a.out @@ -6343,10 +7420,10 @@ rm -f a.out # input file. (Note that this only needs to work for GNU compilers.) ac_save_ext=$ac_ext ac_ext=F -{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 +$as_echo_n "checking whether we are using the GNU Fortran 77 compiler... " >&6; } if test "${ac_cv_f77_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF program main @@ -6362,20 +7439,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_f77_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_compiler_gnu=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_compiler_gnu=no @@ -6385,16 +7463,16 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_f77_compiler_gnu=$ac_compiler_gnu fi -{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 +$as_echo "$ac_cv_f77_compiler_gnu" >&6; } ac_ext=$ac_save_ext ac_test_FFLAGS=${FFLAGS+set} ac_save_FFLAGS=$FFLAGS FFLAGS= -{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 +$as_echo_n "checking whether $F77 accepts -g... " >&6; } if test "${ac_cv_prog_f77_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else FFLAGS=-g cat >conftest.$ac_ext <<_ACEOF @@ -6408,20 +7486,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_f77_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_prog_f77_g=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_prog_f77_g=no @@ -6430,8 +7509,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 +$as_echo "$ac_cv_prog_f77_g" >&6; } if test "$ac_test_FFLAGS" = set; then FFLAGS=$ac_save_FFLAGS elif test $ac_cv_prog_f77_g = yes; then @@ -6448,7 +7527,11 @@ else fi fi -G77=`test $ac_compiler_gnu = yes && echo yes` +if test $ac_compiler_gnu = yes; then + G77=yes +else + G77= +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6459,10 +7542,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! # find the maximum length of command line arguments -{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 +$as_echo_n "checking the maximum length of command line arguments... " >&6; } if test "${lt_cv_sys_max_cmd_len+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else i=0 teststring="ABCD" @@ -6571,11 +7654,11 @@ else fi if test -n $lt_cv_sys_max_cmd_len ; then - { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; } + { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; } else - { echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6; } + { $as_echo "$as_me:$LINENO: result: none" >&5 +$as_echo "none" >&6; } fi @@ -6583,10 +7666,10 @@ fi # Check for command to grab the raw symbol name followed by C symbol from nm. -{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; } if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else # These are sane defaults that work on at least a few old systems. @@ -6691,14 +7774,14 @@ EOF if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Now try to grab the symbols. nlist=conftest.nm if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s "$nlist"; then # Try sorting and uniquifying the output. if sort "$nlist" | uniq > "$nlist"T; then @@ -6753,7 +7836,7 @@ EOF if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext}; then pipe_works=yes fi @@ -6788,17 +7871,17 @@ if test -z "$lt_cv_sys_global_symbol_pipe"; then lt_cv_sys_global_symbol_to_cdecl= fi if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - { echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6; } + { $as_echo "$as_me:$LINENO: result: failed" >&5 +$as_echo "failed" >&6; } else - { echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6; } + { $as_echo "$as_me:$LINENO: result: ok" >&5 +$as_echo "ok" >&6; } fi -{ echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for objdir" >&5 +$as_echo_n "checking for objdir... " >&6; } if test "${lt_cv_objdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else rm -f .libs 2>/dev/null mkdir .libs 2>/dev/null @@ -6810,8 +7893,8 @@ else fi rmdir .libs 2>/dev/null fi -{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 +$as_echo "$lt_cv_objdir" >&6; } objdir=$lt_cv_objdir @@ -6862,10 +7945,10 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$AR"; then ac_cv_prog_AR="$AR" # Let the user override the test. @@ -6878,7 +7961,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AR="${ac_tool_prefix}ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6889,11 +7972,11 @@ fi fi AR=$ac_cv_prog_AR if test -n "$AR"; then - { echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6; } + { $as_echo "$as_me:$LINENO: result: $AR" >&5 +$as_echo "$AR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6902,10 +7985,10 @@ if test -z "$ac_cv_prog_AR"; then ac_ct_AR=$AR # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. @@ -6918,7 +8001,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_AR="ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6929,11 +8012,11 @@ fi fi ac_ct_AR=$ac_cv_prog_ac_ct_AR if test -n "$ac_ct_AR"; then - { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 +$as_echo "$ac_ct_AR" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_AR" = x; then @@ -6941,12 +8024,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac AR=$ac_ct_AR @@ -6958,10 +8037,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -6974,7 +8053,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -6985,11 +8064,11 @@ fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - { echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6; } + { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -6998,10 +8077,10 @@ if test -z "$ac_cv_prog_RANLIB"; then ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. @@ -7014,7 +8093,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7025,11 +8104,11 @@ fi fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_RANLIB" = x; then @@ -7037,12 +8116,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac RANLIB=$ac_ct_RANLIB @@ -7054,10 +8129,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then ac_cv_prog_STRIP="$STRIP" # Let the user override the test. @@ -7070,7 +8145,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7081,11 +8156,11 @@ fi fi STRIP=$ac_cv_prog_STRIP if test -n "$STRIP"; then - { echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6; } + { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7094,10 +8169,10 @@ if test -z "$ac_cv_prog_STRIP"; then ac_ct_STRIP=$STRIP # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. @@ -7110,7 +8185,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7121,11 +8196,11 @@ fi fi ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP if test -n "$ac_ct_STRIP"; then - { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_STRIP" = x; then @@ -7133,12 +8208,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac STRIP=$ac_ct_STRIP @@ -7201,10 +8272,10 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) @@ -7254,19 +8325,19 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } + { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then - { echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for file" >&5 +$as_echo_n "checking for file... " >&6; } if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $MAGIC_CMD in [\\/*] | ?:[\\/]*) @@ -7316,11 +8387,11 @@ fi MAGIC_CMD="$lt_cv_path_MAGIC_CMD" if test -n "$MAGIC_CMD"; then - { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6; } + { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 +$as_echo "$MAGIC_CMD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi else @@ -7338,10 +8409,10 @@ esac if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$DSYMUTIL"; then ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test. @@ -7354,7 +8425,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7365,11 +8436,11 @@ fi fi DSYMUTIL=$ac_cv_prog_DSYMUTIL if test -n "$DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 -echo "${ECHO_T}$DSYMUTIL" >&6; } + { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5 +$as_echo "$DSYMUTIL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7378,10 +8449,10 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then ac_ct_DSYMUTIL=$DSYMUTIL # Extract the first word of "dsymutil", so it can be a program name with args. set dummy dsymutil; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_DSYMUTIL"; then ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test. @@ -7394,7 +8465,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7405,11 +8476,11 @@ fi fi ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL if test -n "$ac_ct_DSYMUTIL"; then - { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 -echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5 +$as_echo "$ac_ct_DSYMUTIL" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_DSYMUTIL" = x; then @@ -7417,12 +8488,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac DSYMUTIL=$ac_ct_DSYMUTIL @@ -7434,10 +8501,10 @@ fi if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. set dummy ${ac_tool_prefix}nmedit; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$NMEDIT"; then ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test. @@ -7450,7 +8517,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7461,11 +8528,11 @@ fi fi NMEDIT=$ac_cv_prog_NMEDIT if test -n "$NMEDIT"; then - { echo "$as_me:$LINENO: result: $NMEDIT" >&5 -echo "${ECHO_T}$NMEDIT" >&6; } + { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5 +$as_echo "$NMEDIT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi @@ -7474,10 +8541,10 @@ if test -z "$ac_cv_prog_NMEDIT"; then ac_ct_NMEDIT=$NMEDIT # Extract the first word of "nmedit", so it can be a program name with args. set dummy nmedit; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NMEDIT"; then ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test. @@ -7490,7 +8557,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_NMEDIT="nmedit" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -7501,11 +8568,11 @@ fi fi ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT if test -n "$ac_ct_NMEDIT"; then - { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 -echo "${ECHO_T}$ac_ct_NMEDIT" >&6; } + { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5 +$as_echo "$ac_ct_NMEDIT" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi if test "x$ac_ct_NMEDIT" = x; then @@ -7513,12 +8580,8 @@ fi else case $cross_compiling:$ac_tool_warned in yes:) -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&5 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools -whose name does not start with the host triplet. If you think this -configuration is useful to you, please write to autoconf@gnu.org." >&2;} +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac NMEDIT=$ac_ct_NMEDIT @@ -7528,10 +8591,10 @@ else fi - { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 -echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5 +$as_echo_n "checking for -single_module linker flag... " >&6; } if test "${lt_cv_apple_cc_single_mod+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_apple_cc_single_mod=no if test -z "${LT_MULTI_MODULE}"; then @@ -7549,12 +8612,12 @@ else rm conftest.c fi fi -{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 -echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; } - { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 -echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if test "${lt_cv_ld_exported_symbols_list+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_ld_exported_symbols_list=no save_LDFLAGS=$LDFLAGS @@ -7581,33 +8644,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then lt_cv_ld_exported_symbols_list=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 lt_cv_ld_exported_symbols_list=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 -echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; } case $host_os in rhapsody* | darwin1.[0123]) _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; @@ -7719,10 +8786,10 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag=' -fno-builtin' -{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext @@ -7737,11 +8804,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7740: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8807: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7744: \$? = $ac_status" >&5 + echo "$as_me:8811: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7754,8 +8821,8 @@ else $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" @@ -7769,8 +8836,8 @@ lt_prog_compiler_wl= lt_prog_compiler_pic= lt_prog_compiler_static= -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl='-Wl,' @@ -8001,18 +9068,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } esac fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 +$as_echo "$lt_prog_compiler_pic" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic"; then -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; } if test "${lt_cv_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works=no ac_outfile=conftest.$ac_objext @@ -8027,11 +9094,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8030: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9097: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8034: \$? = $ac_status" >&5 + echo "$as_me:9101: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8044,8 +9111,8 @@ else $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; } if test x"$lt_cv_prog_compiler_pic_works" = xyes; then case $lt_prog_compiler_pic in @@ -8072,10 +9139,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } if test "${lt_cv_prog_compiler_static_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works=no save_LDFLAGS="$LDFLAGS" @@ -8100,8 +9167,8 @@ else LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; } if test x"$lt_cv_prog_compiler_static_works" = xyes; then : @@ -8110,10 +9177,10 @@ else fi -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o=no $rm -r conftest 2>/dev/null @@ -8131,11 +9198,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8134: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9201: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8138: \$? = $ac_status" >&5 + echo "$as_me:9205: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8157,34 +9224,34 @@ else $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } + { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else need_locks=no fi -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag= @@ -8396,13 +9463,12 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi - link_all_deplibs=no else ld_shlibs=no fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -8615,18 +9681,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -8641,12 +9710,13 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8681,18 +9751,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -8707,12 +9780,13 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -8945,7 +10019,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -9164,8 +10238,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5 +$as_echo "$ld_shlibs" >&6; } test "$ld_shlibs" = no && can_build_shared=no # @@ -9185,15 +10259,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } $rm conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest @@ -9211,7 +10285,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then archive_cmds_need_lc=no @@ -9223,16 +10297,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6; } + { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 +$as_echo "$archive_cmds_need_lc" >&6; } ;; esac fi ;; esac -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -9640,11 +10714,13 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -9656,18 +10732,6 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -9845,19 +10909,19 @@ uts4*) dynamic_linker=no ;; esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } +{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi @@ -9869,8 +10933,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action= if test -n "$hardcode_libdir_flag_spec" || \ test -n "$runpath_var" || \ @@ -9894,8 +10958,8 @@ else # directories. hardcode_action=unsupported fi -{ echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6; } +{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5 +$as_echo "$hardcode_action" >&6; } if test "$hardcode_action" = relink; then # Fast installation is not supported @@ -9908,13 +10972,13 @@ fi striplib= old_striplib= -{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 +$as_echo_n "checking whether stripping libraries is possible... " >&6; } if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else # FIXME - insert some real tests, host_os isn't really good enough case $host_os in @@ -9922,16 +10986,16 @@ else if test -n "$STRIP" ; then striplib="$STRIP -x" old_striplib="$STRIP -S" - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi ;; *) - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } ;; esac fi @@ -9963,10 +11027,10 @@ else darwin*) # if libdl is installed we need to link against it - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" @@ -9998,33 +11062,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_dl_dlopen=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else @@ -10037,10 +11105,10 @@ fi ;; *) - { echo "$as_me:$LINENO: checking for shl_load" >&5 -echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for shl_load" >&5 +$as_echo_n "checking for shl_load... " >&6; } if test "${ac_cv_func_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10093,38 +11161,42 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_func_shl_load=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_shl_load=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 -echo "${ECHO_T}$ac_cv_func_shl_load" >&6; } -if test $ac_cv_func_shl_load = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5 +$as_echo "$ac_cv_func_shl_load" >&6; } +if test "x$ac_cv_func_shl_load" = x""yes; then lt_cv_dlopen="shl_load" else - { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 -echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5 +$as_echo_n "checking for shl_load in -ldld... " >&6; } if test "${ac_cv_lib_dld_shl_load+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" @@ -10156,39 +11228,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_dld_shl_load=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_shl_load=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; } -if test $ac_cv_lib_dld_shl_load = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5 +$as_echo "$ac_cv_lib_dld_shl_load" >&6; } +if test "x$ac_cv_lib_dld_shl_load" = x""yes; then lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld" else - { echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for dlopen" >&5 +$as_echo_n "checking for dlopen... " >&6; } if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -10241,38 +11317,42 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_func_dlopen=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_func_dlopen=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 -echo "${ECHO_T}$ac_cv_func_dlopen" >&6; } -if test $ac_cv_func_dlopen = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5 +$as_echo "$ac_cv_func_dlopen" >&6; } +if test "x$ac_cv_func_dlopen" = x""yes; then lt_cv_dlopen="dlopen" else - { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 -echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +$as_echo_n "checking for dlopen in -ldl... " >&6; } if test "${ac_cv_lib_dl_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" @@ -10304,39 +11384,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_dl_dlopen=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dl_dlopen=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } -if test $ac_cv_lib_dl_dlopen = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +$as_echo "$ac_cv_lib_dl_dlopen" >&6; } +if test "x$ac_cv_lib_dl_dlopen" = x""yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl" else - { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 -echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5 +$as_echo_n "checking for dlopen in -lsvld... " >&6; } if test "${ac_cv_lib_svld_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsvld $LIBS" @@ -10368,39 +11452,43 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_svld_dlopen=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_svld_dlopen=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 -echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; } -if test $ac_cv_lib_svld_dlopen = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5 +$as_echo "$ac_cv_lib_svld_dlopen" >&6; } +if test "x$ac_cv_lib_svld_dlopen" = x""yes; then lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld" else - { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 -echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5 +$as_echo_n "checking for dld_link in -ldld... " >&6; } if test "${ac_cv_lib_dld_dld_link+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldld $LIBS" @@ -10432,33 +11520,37 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_lib_dld_dld_link=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_lib_dld_dld_link=no fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 -echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; } -if test $ac_cv_lib_dld_dld_link = yes; then +{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5 +$as_echo "$ac_cv_lib_dld_dld_link" >&6; } +if test "x$ac_cv_lib_dld_dld_link" = x""yes; then lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld" fi @@ -10497,10 +11589,10 @@ fi save_LIBS="$LIBS" LIBS="$lt_cv_dlopen_libs $LIBS" - { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 +$as_echo_n "checking whether a program can dlopen itself... " >&6; } if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self=cross @@ -10508,7 +11600,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -10592,15 +11684,15 @@ rm -fr conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 +$as_echo "$lt_cv_dlopen_self" >&6; } if test "x$lt_cv_dlopen_self" = xyes; then wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 -echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5 +$as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; } if test "${lt_cv_dlopen_self_static+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : lt_cv_dlopen_self_static=cross @@ -10608,7 +11700,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then (./conftest; exit; ) >&5 2>/dev/null lt_status=$? @@ -10692,8 +11784,8 @@ rm -fr conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 +$as_echo "$lt_cv_dlopen_self_static" >&6; } fi CPPFLAGS="$save_CPPFLAGS" @@ -10715,13 +11807,13 @@ fi # Report which library types will actually be built -{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6; } +{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } -{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -10741,15 +11833,15 @@ aix[4-9]*) fi ;; esac -{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6; } +{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } -{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -{ echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6; } +{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } # The else clause should only fire when bootstrapping the # libtool distribution, otherwise you forgot to ship ltmain.sh @@ -10842,8 +11934,8 @@ if test -f "$ltmain"; then cfgfile="${ofile}T" trap "$rm \"$cfgfile\"; exit 1" 1 2 15 $rm -f "$cfgfile" - { echo "$as_me:$LINENO: creating $ofile" >&5 -echo "$as_me: creating $ofile" >&6;} + { $as_echo "$as_me:$LINENO: creating $ofile" >&5 +$as_echo "$as_me: creating $ofile" >&6;} cat <<__EOF__ >> "$cfgfile" #! $SHELL @@ -11255,18 +12347,18 @@ fi if test -f "$ltmain" && test -n "$tagnames"; then if test ! -f "${ofile}"; then - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 -echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 +$as_echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} fi if test -z "$LTCC"; then eval "`$SHELL ${ofile} --config | grep '^LTCC='`" if test -z "$LTCC"; then - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 -echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 +$as_echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} else - { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 -echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 +$as_echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} fi fi if test -z "$LTCFLAGS"; then @@ -11283,16 +12375,16 @@ echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} # Check whether tagname contains only valid characters case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in "") ;; - *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 -echo "$as_me: error: invalid tag name: $tagname" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 +$as_echo "$as_me: error: invalid tag name: $tagname" >&2;} { (exit 1); exit 1; }; } ;; esac if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null then - { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 -echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} + { { $as_echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 +$as_echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} { (exit 1); exit 1; }; } fi @@ -11435,8 +12527,8 @@ fi ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. - { echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5 +$as_echo_n "checking for ld used by $CC... " >&6; } case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -11465,14 +12557,14 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; } ;; esac elif test "$with_gnu_ld" = yes; then - { echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5 +$as_echo_n "checking for GNU ld... " >&6; } else - { echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5 +$as_echo_n "checking for non-GNU ld... " >&6; } fi if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else if test -z "$LD"; then lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR @@ -11502,19 +12594,19 @@ fi LD="$lt_cv_path_LD" if test -n "$LD"; then - { echo "$as_me:$LINENO: result: $LD" >&5 -echo "${ECHO_T}$LD" >&6; } + { $as_echo "$as_me:$LINENO: result: $LD" >&5 +$as_echo "$LD" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} +test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 +$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} { (exit 1); exit 1; }; } -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else # I'd rather use --version here, but apparently some GNU lds only accept -v. case `$LD -v 2>&1 &1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5 +$as_echo "$lt_cv_prog_gnu_ld" >&6; } with_gnu_ld=$lt_cv_prog_gnu_ld @@ -11577,8 +12669,8 @@ else fi # PORTME: fill in a description of your system's C++ link characteristics -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } ld_shlibs_CXX=yes case $host_os in aix3*) @@ -11695,18 +12787,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -11721,12 +12816,13 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -11762,18 +12858,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_cxx_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -11788,12 +12887,13 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -12196,7 +13296,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' wlarc= @@ -12523,8 +13623,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ld_shlibs_CXX=no ;; esac -{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no GCC_CXX="$GXX" @@ -12543,7 +13643,7 @@ EOF if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # Parse the compiler output and extract the necessary # objects, libraries and library flags. @@ -12699,8 +13799,8 @@ lt_prog_compiler_wl_CXX= lt_prog_compiler_pic_CXX= lt_prog_compiler_static_CXX= -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } # C++ specific cases for pic, static, wl, etc. if test "$GXX" = yes; then @@ -12900,7 +14000,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } ;; esac ;; - netbsd* | netbsdelf*-gnu) + netbsd*) ;; osf3* | osf4* | osf5*) case $cc_basename in @@ -12983,18 +14083,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } esac fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 +$as_echo "$lt_prog_compiler_pic_CXX" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_CXX"; then -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; } if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_CXX=no ac_outfile=conftest.$ac_objext @@ -13009,11 +14109,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13012: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14112: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13016: \$? = $ac_status" >&5 + echo "$as_me:14116: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13026,8 +14126,8 @@ else $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then case $lt_prog_compiler_pic_CXX in @@ -13054,10 +14154,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_CXX=no save_LDFLAGS="$LDFLAGS" @@ -13082,8 +14182,8 @@ else LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; } if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then : @@ -13092,10 +14192,10 @@ else fi -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_CXX=no $rm -r conftest 2>/dev/null @@ -13113,11 +14213,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13116: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14216: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13120: \$? = $ac_status" >&5 + echo "$as_me:14220: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13139,34 +14239,34 @@ else $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } + { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else need_locks=no fi -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' case $host_os in @@ -13185,17 +14285,14 @@ echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared librar cygwin* | mingw*) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' ;; - linux* | k*bsd*-gnu) - link_all_deplibs_CXX=no - ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; esac exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*' -{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 +$as_echo "$ld_shlibs_CXX" >&6; } test "$ld_shlibs_CXX" = no && can_build_shared=no # @@ -13215,15 +14312,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } $rm conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest @@ -13241,7 +14338,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then archive_cmds_need_lc_CXX=no @@ -13253,16 +14350,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; } + { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 +$as_echo "$archive_cmds_need_lc_CXX" >&6; } ;; esac fi ;; esac -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -13618,11 +14715,13 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -13634,18 +14733,6 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -13823,19 +14910,19 @@ uts4*) dynamic_linker=no ;; esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } +{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi @@ -13847,8 +14934,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_CXX= if test -n "$hardcode_libdir_flag_spec_CXX" || \ test -n "$runpath_var_CXX" || \ @@ -13872,8 +14959,8 @@ else # directories. hardcode_action_CXX=unsupported fi -{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6; } +{ $as_echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 +$as_echo "$hardcode_action_CXX" >&6; } if test "$hardcode_action_CXX" = relink; then # Fast installation is not supported @@ -14411,13 +15498,13 @@ done cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; } -{ echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6; } +{ $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 +$as_echo_n "checking if libtool supports shared libraries... " >&6; } +{ $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5 +$as_echo "$can_build_shared" >&6; } -{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 +$as_echo_n "checking whether to build shared libraries... " >&6; } test "$can_build_shared" = "no" && enable_shared=no # On AIX, shared libraries and static libraries use the same namespace, and @@ -14436,15 +15523,15 @@ aix[4-9]*) fi ;; esac -{ echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6; } +{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5 +$as_echo "$enable_shared" >&6; } -{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5 +$as_echo_n "checking whether to build static libraries... " >&6; } # Make sure either enable_shared or enable_static is yes. test "$enable_shared" = yes || enable_static=yes -{ echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6; } +{ $as_echo "$as_me:$LINENO: result: $enable_static" >&5 +$as_echo "$enable_static" >&6; } GCC_F77="$G77" LD_F77="$LD" @@ -14453,8 +15540,8 @@ lt_prog_compiler_wl_F77= lt_prog_compiler_pic_F77= lt_prog_compiler_static_F77= -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_F77='-Wl,' @@ -14685,18 +15772,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } esac fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 +$as_echo "$lt_prog_compiler_pic_F77" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_F77"; then -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... " >&6; } if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_F77=no ac_outfile=conftest.$ac_objext @@ -14711,11 +15798,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14714: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15801: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14718: \$? = $ac_status" >&5 + echo "$as_me:15805: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14728,8 +15815,8 @@ else $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works_F77" >&6; } if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then case $lt_prog_compiler_pic_F77 in @@ -14756,10 +15843,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_F77=no save_LDFLAGS="$LDFLAGS" @@ -14784,8 +15871,8 @@ else LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5 +$as_echo "$lt_cv_prog_compiler_static_works_F77" >&6; } if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then : @@ -14794,10 +15881,10 @@ else fi -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_F77=no $rm -r conftest 2>/dev/null @@ -14815,11 +15902,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14818: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15905: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14822: \$? = $ac_status" >&5 + echo "$as_me:15909: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14841,34 +15928,34 @@ else $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_F77" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } + { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else need_locks=no fi -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag_F77= @@ -15080,13 +16167,12 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi - link_all_deplibs_F77=no else ld_shlibs_F77=no fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -15289,18 +16375,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_f77_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -15315,12 +16404,13 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15345,18 +16435,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_f77_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -15371,12 +16464,13 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -15609,7 +16703,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs_F77=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -15828,8 +16922,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -{ echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 +$as_echo "$ld_shlibs_F77" >&6; } test "$ld_shlibs_F77" = no && can_build_shared=no # @@ -15849,15 +16943,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } $rm conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest @@ -15875,7 +16969,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then archive_cmds_need_lc_F77=no @@ -15887,16 +16981,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; } + { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 +$as_echo "$archive_cmds_need_lc_F77" >&6; } ;; esac fi ;; esac -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -16252,32 +17346,22 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on # powerpc, because MkLinux only supported shared libraries with the # GNU dynamic linker. Since this was broken with cross compilers, # most powerpc-linux boxes support dynamic linking these days and - # people can always --disable-shared, the test was removed, and we - # assume the GNU/Linux dynamic linker is in use. - dynamic_linker='GNU/Linux ld.so' - ;; - -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' + # people can always --disable-shared, the test was removed, and we + # assume the GNU/Linux dynamic linker is in use. + dynamic_linker='GNU/Linux ld.so' ;; netbsd*) @@ -16457,19 +17541,19 @@ uts4*) dynamic_linker=no ;; esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } +{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi @@ -16481,8 +17565,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_F77= if test -n "$hardcode_libdir_flag_spec_F77" || \ test -n "$runpath_var_F77" || \ @@ -16506,8 +17590,8 @@ else # directories. hardcode_action_F77=unsupported fi -{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6; } +{ $as_echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 +$as_echo "$hardcode_action_F77" >&6; } if test "$hardcode_action_F77" = relink; then # Fast installation is not supported @@ -17017,10 +18101,10 @@ if test "$GCC" = yes; then lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' -{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; } if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_rtti_exceptions=no ac_outfile=conftest.$ac_objext @@ -17035,11 +18119,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17038: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18122: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17042: \$? = $ac_status" >&5 + echo "$as_me:18126: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17052,8 +18136,8 @@ else $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; } if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" @@ -17067,8 +18151,8 @@ lt_prog_compiler_wl_GCJ= lt_prog_compiler_pic_GCJ= lt_prog_compiler_static_GCJ= -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; } if test "$GCC" = yes; then lt_prog_compiler_wl_GCJ='-Wl,' @@ -17299,18 +18383,18 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; } esac fi -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 +$as_echo "$lt_prog_compiler_pic_GCJ" >&6; } # # Check to make sure the PIC flag actually works. # if test -n "$lt_prog_compiler_pic_GCJ"; then -{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... " >&6; } if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_pic_works_GCJ=no ac_outfile=conftest.$ac_objext @@ -17325,11 +18409,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17328: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18412: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17332: \$? = $ac_status" >&5 + echo "$as_me:18416: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17342,8 +18426,8 @@ else $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5 +$as_echo "$lt_cv_prog_compiler_pic_works_GCJ" >&6; } if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then case $lt_prog_compiler_pic_GCJ in @@ -17370,10 +18454,10 @@ esac # Check to make sure the static flag actually works. # wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\" -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; } if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_static_works_GCJ=no save_LDFLAGS="$LDFLAGS" @@ -17398,8 +18482,8 @@ else LDFLAGS="$save_LDFLAGS" fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5 +$as_echo "$lt_cv_prog_compiler_static_works_GCJ" >&6; } if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then : @@ -17408,10 +18492,10 @@ else fi -{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; } if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_prog_compiler_c_o_GCJ=no $rm -r conftest 2>/dev/null @@ -17429,11 +18513,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17432: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18516: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17436: \$? = $ac_status" >&5 + echo "$as_me:18520: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17455,34 +18539,34 @@ else $rm conftest* fi -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; } +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 +$as_echo "$lt_cv_prog_compiler_c_o_GCJ" >&6; } hard_links="nottested" if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then # do not overwrite the value of need_locks provided by the user - { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 +$as_echo_n "checking if we can lock with hard links... " >&6; } hard_links=yes $rm conftest* ln conftest.a conftest.b 2>/dev/null && hard_links=no touch conftest.a ln conftest.a conftest.b 2>&5 || hard_links=no ln conftest.a conftest.b 2>/dev/null && hard_links=no - { echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6; } + { $as_echo "$as_me:$LINENO: result: $hard_links" >&5 +$as_echo "$hard_links" >&6; } if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} need_locks=warn fi else need_locks=no fi -{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; } runpath_var= allow_undefined_flag_GCJ= @@ -17694,13 +18778,12 @@ EOF $echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi - link_all_deplibs_GCJ=no else ld_shlibs_GCJ=no fi ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -17913,18 +18996,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -17939,12 +19025,13 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -17979,18 +19066,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then lt_aix_libpath_sed=' /Import File Strings/,/^$/ { @@ -18005,12 +19095,13 @@ if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi @@ -18243,7 +19334,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi link_all_deplibs_GCJ=yes ;; - netbsd* | netbsdelf*-gnu) + netbsd*) if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -18462,8 +19553,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi esac fi -{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 +$as_echo "$ld_shlibs_GCJ" >&6; } test "$ld_shlibs_GCJ" = no && can_build_shared=no # @@ -18483,15 +19574,15 @@ x|xyes) # Test whether the compiler implicitly links with -lc since on some # systems, -lgcc has to come before -lc. If gcc already passes -lc # to ld, don't add -lc before -lgcc. - { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; } $rm conftest* echo "$lt_simple_compile_test_code" > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } 2>conftest.err; then soname=conftest lib=conftest @@ -18509,7 +19600,7 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } then archive_cmds_need_lc_GCJ=no @@ -18521,16 +19612,16 @@ echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >& cat conftest.err 1>&5 fi $rm conftest* - { echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; } + { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 +$as_echo "$archive_cmds_need_lc_GCJ" >&6; } ;; esac fi ;; esac -{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 +$as_echo_n "checking dynamic linker characteristics... " >&6; } library_names_spec= libname_spec='lib$name' soname_spec= @@ -18886,11 +19977,13 @@ linux* | k*bsd*-gnu) # Some rework will be needed to allow for fast_install # before this can be enabled. hardcode_into_libs=yes + sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" + sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -18902,18 +19995,6 @@ linux* | k*bsd*-gnu) dynamic_linker='GNU/Linux ld.so' ;; -netbsdelf*-gnu) - version_type=linux - need_lib_prefix=no - need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' - soname_spec='${libname}${release}${shared_ext}$major' - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - hardcode_into_libs=yes - dynamic_linker='NetBSD ld.elf_so' - ;; - netbsd*) version_type=sunos need_lib_prefix=no @@ -19091,19 +20172,19 @@ uts4*) dynamic_linker=no ;; esac -{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5 -echo "${ECHO_T}$dynamic_linker" >&6; } +{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5 +$as_echo "$dynamic_linker" >&6; } test "$dynamic_linker" = no && can_build_shared=no if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec" fi sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec" fi @@ -19115,8 +20196,8 @@ if test "$GCC" = yes; then variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" fi -{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 -echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5 +$as_echo_n "checking how to hardcode library paths into programs... " >&6; } hardcode_action_GCJ= if test -n "$hardcode_libdir_flag_spec_GCJ" || \ test -n "$runpath_var_GCJ" || \ @@ -19140,8 +20221,8 @@ else # directories. hardcode_action_GCJ=unsupported fi -{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 -echo "${ECHO_T}$hardcode_action_GCJ" >&6; } +{ $as_echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5 +$as_echo "$hardcode_action_GCJ" >&6; } if test "$hardcode_action_GCJ" = relink; then # Fast installation is not supported @@ -20064,8 +21145,8 @@ CC="$lt_save_CC" ;; *) - { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 -echo "$as_me: error: Unsupported tag name: $tagname" >&2;} + { { $as_echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 +$as_echo "$as_me: error: Unsupported tag name: $tagname" >&2;} { (exit 1); exit 1; }; } ;; esac @@ -20084,8 +21165,8 @@ echo "$as_me: error: Unsupported tag name: $tagname" >&2;} chmod +x "$ofile" else rm -f "${ofile}T" - { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 -echo "$as_me: error: unable to update list of available tagged configurations." >&2;} + { { $as_echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 +$as_echo "$as_me: error: unable to update list of available tagged configurations." >&2;} { (exit 1); exit 1; }; } fi fi @@ -20120,8 +21201,8 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' -{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 -echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 +$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval @@ -20129,11 +21210,9 @@ else USE_MAINTAINER_MODE=no fi - { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 -echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; } - - -if test $USE_MAINTAINER_MODE = yes; then + { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 +$as_echo "$USE_MAINTAINER_MODE" >&6; } + if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= MAINTAINER_MODE_FALSE='#' else @@ -20145,10 +21224,10 @@ fi -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +$as_echo_n "checking for ANSI C header files... " >&6; } if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -20175,20 +21254,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_cv_header_stdc=no @@ -20280,37 +21360,40 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' { (case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_try") 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: program exited with status $ac_status" >&5 +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ( exit $ac_status ) ac_cv_header_stdc=no fi +rm -rf conftest.dSYM rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +$as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then cat >>confdefs.h <<\_ACEOF @@ -20319,8 +21402,8 @@ _ACEOF fi -{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +$as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file @@ -20343,9 +21426,9 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken + { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken alias in your environment" >&2;} { (exit 1); exit 1; }; } fi @@ -20356,14 +21439,14 @@ then # Ok. : else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! + { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! +$as_echo "$as_me: error: newly created file is older than distributed files! Check your system clock" >&2;} { (exit 1); exit 1; }; } fi -{ echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } +{ $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } WEBSITE_HOST=pippin.gimp.org @@ -20376,7 +21459,6 @@ if eval "test x$GCC = xyes"; then *\ \ -Wall\ \ *) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac -fi extra_warnings= @@ -20384,8 +21466,8 @@ fi if test -z "$extra_warnings"; then extra_warnings_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +$as_echo_n "checking whether $CC understands $flag... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20407,28 +21489,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then extra_warnings_works=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 extra_warnings_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 -echo "${ECHO_T}$extra_warnings_works" >&6; } + { $as_echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 +$as_echo "$extra_warnings_works" >&6; } CFLAGS="$extra_warnings_save_CFLAGS" if test "x$extra_warnings_works" = "xyes"; then extra_warnings="$flag" @@ -20444,8 +21527,8 @@ CFLAGS="$CFLAGS $extra_warnings" if test -z "$extra_warnings"; then extra_warnings_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +$as_echo_n "checking whether $CC understands $flag... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20467,28 +21550,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then extra_warnings_works=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 extra_warnings_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 -echo "${ECHO_T}$extra_warnings_works" >&6; } + { $as_echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 +$as_echo "$extra_warnings_works" >&6; } CFLAGS="$extra_warnings_save_CFLAGS" if test "x$extra_warnings_works" = "xyes"; then extra_warnings="$flag" @@ -20504,8 +21588,8 @@ CFLAGS="$CFLAGS $extra_warnings" if test -z "$extra_warnings"; then extra_warnings_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +$as_echo_n "checking whether $CC understands $flag... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20527,28 +21611,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then extra_warnings_works=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 extra_warnings_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 -echo "${ECHO_T}$extra_warnings_works" >&6; } + { $as_echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 +$as_echo "$extra_warnings_works" >&6; } CFLAGS="$extra_warnings_save_CFLAGS" if test "x$extra_warnings_works" = "xyes"; then extra_warnings="$flag" @@ -20564,8 +21649,8 @@ CFLAGS="$CFLAGS $extra_warnings" if test -z "$extra_warnings"; then extra_warnings_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +$as_echo_n "checking whether $CC understands $flag... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20587,28 +21672,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then extra_warnings_works=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 extra_warnings_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 -echo "${ECHO_T}$extra_warnings_works" >&6; } + { $as_echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 +$as_echo "$extra_warnings_works" >&6; } CFLAGS="$extra_warnings_save_CFLAGS" if test "x$extra_warnings_works" = "xyes"; then extra_warnings="$flag" @@ -20624,8 +21710,8 @@ CFLAGS="$CFLAGS $extra_warnings" if test -z "$extra_warnings"; then extra_warnings_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +$as_echo_n "checking whether $CC understands $flag... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20647,28 +21733,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then extra_warnings_works=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 extra_warnings_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 -echo "${ECHO_T}$extra_warnings_works" >&6; } + { $as_echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 +$as_echo "$extra_warnings_works" >&6; } CFLAGS="$extra_warnings_save_CFLAGS" if test "x$extra_warnings_works" = "xyes"; then extra_warnings="$flag" @@ -20684,8 +21771,8 @@ CFLAGS="$CFLAGS $extra_warnings" if test -z "$extra_warnings"; then extra_warnings_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +$as_echo_n "checking whether $CC understands $flag... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -20707,28 +21794,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then extra_warnings_works=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 extra_warnings_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 -echo "${ECHO_T}$extra_warnings_works" >&6; } + { $as_echo "$as_me:$LINENO: result: $extra_warnings_works" >&5 +$as_echo "$extra_warnings_works" >&6; } CFLAGS="$extra_warnings_save_CFLAGS" if test "x$extra_warnings_works" = "xyes"; then extra_warnings="$flag" @@ -20738,17 +21826,18 @@ echo "${ECHO_T}$extra_warnings_works" >&6; } CFLAGS="$CFLAGS $extra_warnings" +fi -# Extract the first word of "inkscape", so it can be a program name with args. -set dummy inkscape; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_path_INKSCAPE+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 +# Extract the first word of "rsvg", so it can be a program name with args. +set dummy rsvg; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_RSVG+set}" = set; then + $as_echo_n "(cached) " >&6 else - case $INKSCAPE in + case $RSVG in [\\/]* | ?:[\\/]*) - ac_cv_path_INKSCAPE="$INKSCAPE" # Let the user override the test with a path. + ac_cv_path_RSVG="$RSVG" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -20758,45 +21847,43 @@ do test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_path_INKSCAPE="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + ac_cv_path_RSVG="$as_dir/$ac_word$ac_exec_ext" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done IFS=$as_save_IFS - test -z "$ac_cv_path_INKSCAPE" && ac_cv_path_INKSCAPE="no" + test -z "$ac_cv_path_RSVG" && ac_cv_path_RSVG="no" ;; esac fi -INKSCAPE=$ac_cv_path_INKSCAPE -if test -n "$INKSCAPE"; then - { echo "$as_me:$LINENO: result: $INKSCAPE" >&5 -echo "${ECHO_T}$INKSCAPE" >&6; } +RSVG=$ac_cv_path_RSVG +if test -n "$RSVG"; then + { $as_echo "$as_me:$LINENO: result: $RSVG" >&5 +$as_echo "$RSVG" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - - -if test "x$INKSCAPE" != "xno"; then - HAVE_INKSCAPE_TRUE= - HAVE_INKSCAPE_FALSE='#' + if test "x$RSVG" != "xno"; then + HAVE_RSVG_TRUE= + HAVE_RSVG_FALSE='#' else - HAVE_INKSCAPE_TRUE='#' - HAVE_INKSCAPE_FALSE= + HAVE_RSVG_TRUE='#' + HAVE_RSVG_FALSE= fi # Extract the first word of "w3m", so it can be a program name with args. set dummy w3m; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } if test "${ac_cv_path_W3M+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else case $W3M in [\\/]* | ?:[\\/]*) @@ -20811,7 +21898,7 @@ do for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_W3M="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done @@ -20824,17 +21911,15 @@ esac fi W3M=$ac_cv_path_W3M if test -n "$W3M"; then - { echo "$as_me:$LINENO: result: $W3M" >&5 -echo "${ECHO_T}$W3M" >&6; } + { $as_echo "$as_me:$LINENO: result: $W3M" >&5 +$as_echo "$W3M" >&6; } else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } fi - - -if test "x$W3M" != "xno"; then + if test "x$W3M" != "xno"; then HAVE_W3M_TRUE= HAVE_W3M_FALSE='#' else @@ -20847,16 +21932,16 @@ fi # Check target architecture ########################### -{ echo "$as_me:$LINENO: checking for target architecture" >&5 -echo $ECHO_N "checking for target architecture... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for target architecture" >&5 +$as_echo_n "checking for target architecture... " >&6; } case x"$target" in xNONE | x) target_or_host="$host" ;; *) target_or_host="$target" ;; esac -{ echo "$as_me:$LINENO: result: $target_or_host" >&5 -echo "${ECHO_T}$target_or_host" >&6; } +{ $as_echo "$as_me:$LINENO: result: $target_or_host" >&5 +$as_echo "$target_or_host" >&6; } case "$target_or_host" in i*86-*-*) @@ -20906,23 +21991,23 @@ _ACEOF esac -#################################################### -# Check how to generate plug-ins (with gcc at least) -#################################################### +############################ +# Check how to find plug-ins +############################ -{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 -echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +$as_echo_n "checking for some Win32 platform... " >&6; } case "$target_or_host" in *-*-darwin*) # darwin shrext=.dylib - dynamiclib=-dynamiclib + ;; + hppa*-hpux*) # HP/UX + shrext=.sl ;; *-*-mingw* | *-*-cygwin*) # windows shrext=.dll - dynamiclib=-shared ;; *) # linux (and BSD?) - dynamiclib=-shared shrext=.so ;; esac @@ -20935,21 +22020,13 @@ cat >>confdefs.h <<_ACEOF _ACEOF -DYNAMICLIB=$dynamiclib - - -cat >>confdefs.h <<_ACEOF -#define DYNAMICLIB "$dynamiclib" -_ACEOF - - ################# # Check for Win32 ################# -{ echo "$as_me:$LINENO: checking for some Win32 platform" >&5 -echo $ECHO_N "checking for some Win32 platform... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for some Win32 platform" >&5 +$as_echo_n "checking for some Win32 platform... " >&6; } case "$target_or_host" in *-*-mingw* | *-*-cygwin*) platform_win32=yes @@ -20958,11 +22035,9 @@ case "$target_or_host" in platform_win32=no ;; esac -{ echo "$as_me:$LINENO: result: $platform_win32" >&5 -echo "${ECHO_T}$platform_win32" >&6; } - - -if test "$platform_win32" = "yes"; then +{ $as_echo "$as_me:$LINENO: result: $platform_win32" >&5 +$as_echo "$platform_win32" >&6; } + if test "$platform_win32" = "yes"; then PLATFORM_WIN32_TRUE= PLATFORM_WIN32_FALSE='#' else @@ -20972,8 +22047,8 @@ fi MATH_LIB=-lm -{ echo "$as_me:$LINENO: checking for native Win32" >&5 -echo $ECHO_N "checking for native Win32... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for native Win32" >&5 +$as_echo_n "checking for native Win32... " >&6; } case "$target_or_host" in *-*-mingw*) os_win32=yes @@ -20987,15 +22062,13 @@ case "$target_or_host" in DIR_SEP='/' ;; esac -{ echo "$as_me:$LINENO: result: $os_win32" >&5 -echo "${ECHO_T}$os_win32" >&6; } +{ $as_echo "$as_me:$LINENO: result: $os_win32" >&5 +$as_echo "$os_win32" >&6; } - - -if test "$os_win32" = "yes"; then + if test "$os_win32" = "yes"; then OS_WIN32_TRUE= OS_WIN32_FALSE='#' else @@ -21003,9 +22076,7 @@ else OS_WIN32_FALSE= fi - - -if test "$os_win32" != "yes"; then + if test "$os_win32" != "yes"; then OS_UNIX_TRUE= OS_UNIX_FALSE='#' else @@ -21044,8 +22115,8 @@ if test "x$enable_mmx" = xyes; then if test -z "$MMX_EXTRA_CFLAGS"; then MMX_EXTRA_CFLAGS_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +$as_echo_n "checking whether $CC understands $flag... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21067,28 +22138,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then MMX_EXTRA_CFLAGS_works=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 MMX_EXTRA_CFLAGS_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $MMX_EXTRA_CFLAGS_works" >&5 -echo "${ECHO_T}$MMX_EXTRA_CFLAGS_works" >&6; } + { $as_echo "$as_me:$LINENO: result: $MMX_EXTRA_CFLAGS_works" >&5 +$as_echo "$MMX_EXTRA_CFLAGS_works" >&6; } CFLAGS="$MMX_EXTRA_CFLAGS_save_CFLAGS" if test "x$MMX_EXTRA_CFLAGS_works" = "xyes"; then MMX_EXTRA_CFLAGS="$flag" @@ -21098,8 +22170,8 @@ echo "${ECHO_T}$MMX_EXTRA_CFLAGS_works" >&6; } SSE_EXTRA_CFLAGS= - { echo "$as_me:$LINENO: checking whether we can compile MMX code" >&5 -echo $ECHO_N "checking whether we can compile MMX code... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether we can compile MMX code" >&5 +$as_echo_n "checking whether we can compile MMX code... " >&6; } mmx_save_CFLAGS="$CFLAGS" CFLAGS="$mmx_save_CFLAGS $MMX_EXTRA_CFLAGS" @@ -21113,13 +22185,14 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err @@ -21129,8 +22202,8 @@ cat >>confdefs.h <<\_ACEOF #define USE_MMX 1 _ACEOF - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } if test "x$enable_sse" = xyes; then @@ -21139,8 +22212,8 @@ echo "${ECHO_T}yes" >&6; } if test -z "$sse_flag"; then sse_flag_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +$as_echo_n "checking whether $CC understands $flag... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21162,28 +22235,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then sse_flag_works=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 sse_flag_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $sse_flag_works" >&5 -echo "${ECHO_T}$sse_flag_works" >&6; } + { $as_echo "$as_me:$LINENO: result: $sse_flag_works" >&5 +$as_echo "$sse_flag_works" >&6; } CFLAGS="$sse_flag_save_CFLAGS" if test "x$sse_flag_works" = "xyes"; then sse_flag="$flag" @@ -21193,8 +22267,8 @@ echo "${ECHO_T}$sse_flag_works" >&6; } SSE_EXTRA_CFLAGS="$MMX_EXTRA_CFLAGS $sse_flag" - { echo "$as_me:$LINENO: checking whether we can compile SSE code" >&5 -echo $ECHO_N "checking whether we can compile SSE code... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether we can compile SSE code" >&5 +$as_echo_n "checking whether we can compile SSE code... " >&6; } CFLAGS="$CFLAGS $sse_flag" @@ -21207,13 +22281,14 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err @@ -21223,18 +22298,18 @@ cat >>confdefs.h <<\_ACEOF #define USE_SSE 1 _ACEOF - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } + { $as_echo "$as_me:$LINENO: result: yes" >&5 +$as_echo "yes" >&6; } else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 enable_sse=no - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: WARNING: The assembler does not support the SSE command set." >&5 -echo "$as_me: WARNING: The assembler does not support the SSE command set." >&2;} + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: WARNING: The assembler does not support the SSE command set." >&5 +$as_echo "$as_me: WARNING: The assembler does not support the SSE command set." >&2;} fi @@ -21243,14 +22318,14 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 enable_mmx=no - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: WARNING: The assembler does not support the MMX command set." >&5 -echo "$as_me: WARNING: The assembler does not support the MMX command set." >&2;} + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: WARNING: The assembler does not support the MMX command set." >&5 +$as_echo "$as_me: WARNING: The assembler does not support the MMX command set." >&2;} fi @@ -21283,8 +22358,8 @@ if test "x$enable_altivec" = xyes; then if test -z "$altivec_flag"; then altivec_flag_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $flag" - { echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 -echo $ECHO_N "checking whether $CC understands $flag... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether $CC understands $flag" >&5 +$as_echo_n "checking whether $CC understands $flag... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21306,28 +22381,29 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then altivec_flag_works=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 altivec_flag_works=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - { echo "$as_me:$LINENO: result: $altivec_flag_works" >&5 -echo "${ECHO_T}$altivec_flag_works" >&6; } + { $as_echo "$as_me:$LINENO: result: $altivec_flag_works" >&5 +$as_echo "$altivec_flag_works" >&6; } CFLAGS="$altivec_flag_save_CFLAGS" if test "x$altivec_flag_works" = "xyes"; then altivec_flag="$flag" @@ -21344,20 +22420,21 @@ echo "${ECHO_T}$altivec_flag_works" >&6; } for ac_header in altivec.h do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } else # Is the header compilable? -{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21373,32 +22450,33 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_compiler=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } # Is the header present? -{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -21412,69 +22490,73 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then ac_header_preproc=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 ac_header_preproc=no fi rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } # So? What about this header? case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} ac_header_preproc=yes ;; no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ;; esac -{ echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else eval "$as_ac_Header=\$ac_header_preproc" fi -ac_res=`eval echo '${'$as_ac_Header'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF ALTIVEC_EXTRA_CFLAGS="$altivec_flag" fi @@ -21489,15 +22571,15 @@ done esac - { echo "$as_me:$LINENO: checking whether we can compile AltiVec code" >&5 -echo $ECHO_N "checking whether we can compile AltiVec code... $ECHO_C" >&6; } + { $as_echo "$as_me:$LINENO: checking whether we can compile AltiVec code" >&5 +$as_echo_n "checking whether we can compile AltiVec code... " >&6; } can_use_altivec=no if test -z "$ALTIVEC_EXTRA_CFLAGS"; then - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } - { echo "$as_me:$LINENO: WARNING: The compiler does not support the AltiVec command set." >&5 -echo "$as_me: WARNING: The compiler does not support the AltiVec command set." >&2;} + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } + { $as_echo "$as_me:$LINENO: WARNING: The compiler does not support the AltiVec command set." >&5 +$as_echo "$as_me: WARNING: The compiler does not support the AltiVec command set." >&2;} else case "$target_or_host" in *-*-darwin*) @@ -21518,20 +22600,21 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_compile") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err } && test -s conftest.$ac_objext; then can_use_altivec=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 can_use_altivec=no @@ -21540,8 +22623,8 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ;; esac - { echo "$as_me:$LINENO: result: $can_use_altivec" >&5 -echo "${ECHO_T}$can_use_altivec" >&6; } + { $as_echo "$as_me:$LINENO: result: $can_use_altivec" >&5 +$as_echo "$can_use_altivec" >&6; } if test "x$can_use_altivec" = "xyes"; then @@ -21551,8 +22634,8 @@ _ACEOF else enable_altivec=no - { echo "$as_me:$LINENO: WARNING: The assembler does not support the AltiVec command set." >&5 -echo "$as_me: WARNING: The assembler does not support the AltiVec command set." >&2;} + { $as_echo "$as_me:$LINENO: WARNING: The assembler does not support the AltiVec command set." >&5 +$as_echo "$as_me: WARNING: The assembler does not support the AltiVec command set." >&2;} fi fi @@ -21561,10 +22644,157 @@ fi -{ echo "$as_me:$LINENO: checking for library containing dlopen" >&5 -echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; } + +for ac_header in dl.h +do +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 +$as_echo_n "checking $ac_header usability... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 +$as_echo_n "checking $ac_header presence... " >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 +$as_echo_n "checking for $ac_header... " >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + $as_echo_n "(cached) " >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + +fi +as_val=`eval 'as_val=${'$as_ac_Header'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + +{ $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&5 +$as_echo_n "checking for library containing dlopen... " >&6; } if test "${ac_cv_search_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF @@ -21602,26 +22832,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_search_dlopen=$ac_res else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_dlopen+set}" = set; then @@ -21636,18 +22870,18 @@ fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5 -echo "${ECHO_T}$ac_cv_search_dlopen" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5 +$as_echo "$ac_cv_search_dlopen" >&6; } ac_res=$ac_cv_search_dlopen if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -{ echo "$as_me:$LINENO: checking for library containing rint" >&5 -echo $ECHO_N "checking for library containing rint... $ECHO_C" >&6; } +{ $as_echo "$as_me:$LINENO: checking for library containing rint" >&5 +$as_echo_n "checking for library containing rint... " >&6; } if test "${ac_cv_search_rint+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS cat >conftest.$ac_ext <<_ACEOF @@ -21685,26 +22919,30 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then ac_cv_search_rint=$ac_res else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext if test "${ac_cv_search_rint+set}" = set; then @@ -21719,8 +22957,8 @@ fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ echo "$as_me:$LINENO: result: $ac_cv_search_rint" >&5 -echo "${ECHO_T}$ac_cv_search_rint" >&6; } +{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_rint" >&5 +$as_echo "$ac_cv_search_rint" >&6; } ac_res=$ac_cv_search_rint if test "$ac_res" != no; then test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" @@ -21731,11 +22969,11 @@ fi for ac_func in gettimeofday do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -21788,35 +23026,42 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then eval "$as_ac_var=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF else @@ -21833,11 +23078,11 @@ done for ac_func in rint do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 +$as_echo_n "checking for $ac_func... " >&6; } if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -21890,35 +23135,42 @@ case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +$as_echo "$ac_try_echo") >&5 (eval "$ac_link") 2>conftest.er1 ac_status=$? grep -v '^ *+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { test -z "$ac_c_werror_flag" || test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then eval "$as_ac_var=yes" else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 eval "$as_ac_var=no" fi +rm -rf conftest.dSYM rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval echo '${'$as_ac_var'}'` - { echo "$as_me:$LINENO: result: $ac_res" >&5 -echo "${ECHO_T}$ac_res" >&6; } -if test `eval echo '${'$as_ac_var'}'` = yes; then +ac_res=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +as_val=`eval 'as_val=${'$as_ac_var'} + $as_echo "$as_val"'` + if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -21977,11 +23229,12 @@ _ACEOF case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( + BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( *) $as_unset $ac_var ;; esac ;; esac @@ -22014,12 +23267,12 @@ echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { echo "$as_me:$LINENO: updating cache $cache_file" >&5 -echo "$as_me: updating cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 +$as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -echo "$as_me: not updating unwritable cache $cache_file" >&6;} + { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache @@ -22035,7 +23288,7 @@ ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`echo "$ac_i" | sed "$ac_script"` + ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" @@ -22047,82 +23300,90 @@ LTLIBOBJS=$ac_ltlibobjs if test -z "${BABL_UNSTABLE_TRUE}" && test -z "${BABL_UNSTABLE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"BABL_UNSTABLE\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"BABL_UNSTABLE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"BABL_UNSTABLE\" was never defined. +$as_echo "$as_me: error: conditional \"BABL_UNSTABLE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi +if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"AMDEP\" was never defined. +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. +$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. +$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. +$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${HAVE_INKSCAPE_TRUE}" && test -z "${HAVE_INKSCAPE_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_INKSCAPE\" was never defined. +if test -z "${HAVE_RSVG_TRUE}" && test -z "${HAVE_RSVG_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_RSVG\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_INKSCAPE\" was never defined. +$as_echo "$as_me: error: conditional \"HAVE_RSVG\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${HAVE_W3M_TRUE}" && test -z "${HAVE_W3M_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"HAVE_W3M\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_W3M\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"HAVE_W3M\" was never defined. +$as_echo "$as_me: error: conditional \"HAVE_W3M\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${PLATFORM_WIN32_TRUE}" && test -z "${PLATFORM_WIN32_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"PLATFORM_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. +$as_echo "$as_me: error: conditional \"PLATFORM_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"OS_WIN32\" was never defined. +$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi if test -z "${OS_UNIX_TRUE}" && test -z "${OS_UNIX_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. + { { $as_echo "$as_me:$LINENO: error: conditional \"OS_UNIX\" was never defined. Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"OS_UNIX\" was never defined. +$as_echo "$as_me: error: conditional \"OS_UNIX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi : ${CONFIG_STATUS=./config.status} +ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF +{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -22135,7 +23396,7 @@ ac_cs_silent=false SHELL=\${CONFIG_SHELL-$SHELL} _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ## --------------------- ## ## M4sh Initialization. ## ## --------------------- ## @@ -22145,7 +23406,7 @@ DUALCASE=1; export DUALCASE # for MKS sh if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST @@ -22167,17 +23428,45 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' +as_nl=' +' +export as_nl +# Printing a long string crashes Solaris 7 /usr/bin/printf. +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='printf %s\n' + as_echo_n='printf %s' +else + if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then + as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' + as_echo_n='/usr/ucb/echo -n' else - PATH_SEPARATOR=: + as_echo_body='eval expr "X$1" : "X\\(.*\\)"' + as_echo_n_body='eval + arg=$1; + case $arg in + *"$as_nl"*) + expr "X$arg" : "X\\(.*\\)$as_nl"; + arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; + esac; + expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" + ' + export as_echo_n_body + as_echo_n='sh -c $as_echo_n_body as_echo' fi - rm -f conf$$.sh + export as_echo_body + as_echo='sh -c $as_echo_body as_echo' +fi + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + PATH_SEPARATOR=: + (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { + (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || + PATH_SEPARATOR=';' + } fi # Support unset when possible. @@ -22193,8 +23482,6 @@ fi # there to prevent editors from complaining about space-tab. # (If _AS_PATH_WALK were called with IFS unset, it would disable word # splitting by setting IFS to empty value.) -as_nl=' -' IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. @@ -22217,7 +23504,7 @@ if test "x$as_myself" = x; then as_myself=$0 fi if test ! -f "$as_myself"; then - echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 { (exit 1); exit 1; } fi @@ -22230,17 +23517,10 @@ PS2='> ' PS4='+ ' # NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - fi -done +LC_ALL=C +export LC_ALL +LANGUAGE=C +export LANGUAGE # Required to use basename. if expr a : '\(a\)' >/dev/null 2>&1 && @@ -22262,7 +23542,7 @@ as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ X"$0" : 'X\(/\)' \| . 2>/dev/null || -echo X/"$0" | +$as_echo X/"$0" | sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/ q @@ -22313,7 +23593,7 @@ $as_unset CDPATH s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems @@ -22341,7 +23621,6 @@ case `echo -n x` in *) ECHO_N='-n';; esac - if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -22354,19 +23633,22 @@ if test -d conf$$.dir; then rm -f conf$$.dir/conf$$.file else rm -f conf$$.dir - mkdir conf$$.dir -fi -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + mkdir conf$$.dir 2>/dev/null +fi +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' + elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln + else as_ln_s='cp -p' -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln + fi else as_ln_s='cp -p' fi @@ -22391,10 +23673,10 @@ else as_test_x=' eval sh -c '\'' if test -d "$1"; then - test -d "$1/."; + test -d "$1/."; else case $1 in - -*)set "./$1";; + -*)set "./$1";; esac; case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in ???[sx]*):;;*)false;;esac;fi @@ -22416,8 +23698,8 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by babl $as_me 0.0.22, which was -generated by GNU Autoconf 2.61. Invocation command line was +This file was extended by babl $as_me 0.1.0, which was +generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -22430,7 +23712,16 @@ on `(hostname || uname -n) 2>/dev/null | sed 1q` _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +case $ac_config_files in *" +"*) set x $ac_config_files; shift; ac_config_files=$*;; +esac + +case $ac_config_headers in *" +"*) set x $ac_config_headers; shift; ac_config_headers=$*;; +esac + + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" config_headers="$ac_config_headers" @@ -22438,22 +23729,23 @@ config_commands="$ac_config_commands" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ \`$as_me' instantiates files from templates according to the current configuration. -Usage: $0 [OPTIONS] [FILE]... +Usage: $0 [OPTION]... [FILE]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit - -q, --quiet do not print progress messages + -q, --quiet, --silent + do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files @@ -22467,24 +23759,26 @@ $config_commands Report bugs to ." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -babl config.status 0.0.22 -configured by $0, generated by GNU Autoconf 2.61, - with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +babl config.status 0.1.0 +configured by $0, generated by GNU Autoconf 2.63, + with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2006 Free Software Foundation, Inc. +Copyright (C) 2008 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." ac_pwd='$ac_pwd' srcdir='$srcdir' INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +AWK='$AWK' +test -n "\$AWK" || AWK=awk _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# The default lists apply if the user does not specify any file. ac_need_defaults=: while test $# != 0 do @@ -22506,30 +23800,36 @@ do -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - echo "$ac_cs_version"; exit ;; + $as_echo "$ac_cs_version"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + case $ac_optarg in + *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { echo "$as_me: error: ambiguous option: $1 + { $as_echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; };; --help | --hel | -h ) - echo "$ac_cs_usage"; exit ;; + $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) { echo "$as_me: error: unrecognized option: $1 + -*) { $as_echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2 { (exit 1); exit 1; }; } ;; @@ -22548,27 +23848,29 @@ if $ac_cs_silent; then fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - CONFIG_SHELL=$SHELL + set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + shift + \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 + CONFIG_SHELL='$SHELL' export CONFIG_SHELL - exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + exec "\$@" fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 exec 5>>config.log { echo sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX ## Running $as_me. ## _ASBOX - echo "$ac_log" + $as_echo "$ac_log" } >&5 _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # # INIT-COMMANDS # @@ -22576,7 +23878,7 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # Handling of arguments. for ac_config_target in $ac_config_targets @@ -22596,8 +23898,8 @@ do "extensions/Makefile") CONFIG_FILES="$CONFIG_FILES extensions/Makefile" ;; "INSTALL") CONFIG_FILES="$CONFIG_FILES INSTALL" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac done @@ -22638,253 +23940,144 @@ $debug || (umask 077 && mkdir "$tmp") } || { - echo "$me: cannot create a temporary directory in ." >&2 + $as_echo "$as_me: cannot create a temporary directory in ." >&2 { (exit 1); exit 1; } } -# -# Set up the sed scripts for CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h +# Set up the scripts for CONFIG_FILES section. +# No need to generate them if there are no CONFIG_FILES. +# This happens for instance with `./config.status config.h'. if test -n "$CONFIG_FILES"; then -_ACEOF - - -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -SHELL!$SHELL$ac_delim -PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -PACKAGE_NAME!$PACKAGE_NAME$ac_delim -PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -PACKAGE_STRING!$PACKAGE_STRING$ac_delim -PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -exec_prefix!$exec_prefix$ac_delim -prefix!$prefix$ac_delim -program_transform_name!$program_transform_name$ac_delim -bindir!$bindir$ac_delim -sbindir!$sbindir$ac_delim -libexecdir!$libexecdir$ac_delim -datarootdir!$datarootdir$ac_delim -datadir!$datadir$ac_delim -sysconfdir!$sysconfdir$ac_delim -sharedstatedir!$sharedstatedir$ac_delim -localstatedir!$localstatedir$ac_delim -includedir!$includedir$ac_delim -oldincludedir!$oldincludedir$ac_delim -docdir!$docdir$ac_delim -infodir!$infodir$ac_delim -htmldir!$htmldir$ac_delim -dvidir!$dvidir$ac_delim -pdfdir!$pdfdir$ac_delim -psdir!$psdir$ac_delim -libdir!$libdir$ac_delim -localedir!$localedir$ac_delim -mandir!$mandir$ac_delim -DEFS!$DEFS$ac_delim -ECHO_C!$ECHO_C$ac_delim -ECHO_N!$ECHO_N$ac_delim -ECHO_T!$ECHO_T$ac_delim -LIBS!$LIBS$ac_delim -build_alias!$build_alias$ac_delim -host_alias!$host_alias$ac_delim -target_alias!$target_alias$ac_delim -BABL_MAJOR_VERSION!$BABL_MAJOR_VERSION$ac_delim -BABL_MINOR_VERSION!$BABL_MINOR_VERSION$ac_delim -BABL_MICRO_VERSION!$BABL_MICRO_VERSION$ac_delim -BABL_INTERFACE_AGE!$BABL_INTERFACE_AGE$ac_delim -BABL_BINARY_AGE!$BABL_BINARY_AGE$ac_delim -BABL_VERSION!$BABL_VERSION$ac_delim -BABL_REAL_VERSION!$BABL_REAL_VERSION$ac_delim -BABL_API_VERSION!$BABL_API_VERSION$ac_delim -BABL_RELEASE!$BABL_RELEASE$ac_delim -BABL_UNSTABLE_TRUE!$BABL_UNSTABLE_TRUE$ac_delim -BABL_UNSTABLE_FALSE!$BABL_UNSTABLE_FALSE$ac_delim -BABL_UNSTABLE!$BABL_UNSTABLE$ac_delim -BABL_LIBRARY_VERSION!$BABL_LIBRARY_VERSION$ac_delim -BABL_CURRENT_MINUS_AGE!$BABL_CURRENT_MINUS_AGE$ac_delim -INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -INSTALL_DATA!$INSTALL_DATA$ac_delim -CYGPATH_W!$CYGPATH_W$ac_delim -PACKAGE!$PACKAGE$ac_delim -VERSION!$VERSION$ac_delim -ACLOCAL!$ACLOCAL$ac_delim -AUTOCONF!$AUTOCONF$ac_delim -AUTOMAKE!$AUTOMAKE$ac_delim -AUTOHEADER!$AUTOHEADER$ac_delim -MAKEINFO!$MAKEINFO$ac_delim -install_sh!$install_sh$ac_delim -STRIP!$STRIP$ac_delim -INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim -mkdir_p!$mkdir_p$ac_delim -AWK!$AWK$ac_delim -SET_MAKE!$SET_MAKE$ac_delim -am__leading_dot!$am__leading_dot$ac_delim -AMTAR!$AMTAR$ac_delim -am__tar!$am__tar$ac_delim -am__untar!$am__untar$ac_delim -CC!$CC$ac_delim -CFLAGS!$CFLAGS$ac_delim -LDFLAGS!$LDFLAGS$ac_delim -CPPFLAGS!$CPPFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -DEPDIR!$DEPDIR$ac_delim -am__include!$am__include$ac_delim -am__quote!$am__quote$ac_delim -AMDEP_TRUE!$AMDEP_TRUE$ac_delim -AMDEP_FALSE!$AMDEP_FALSE$ac_delim -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -CCDEPMODE!$CCDEPMODE$ac_delim -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -build!$build$ac_delim -build_cpu!$build_cpu$ac_delim -build_vendor!$build_vendor$ac_delim -build_os!$build_os$ac_delim -host!$host$ac_delim -host_cpu!$host_cpu$ac_delim -host_vendor!$host_vendor$ac_delim -host_os!$host_os$ac_delim -SED!$SED$ac_delim -_ACEOF - - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done - -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` +ac_cr=' ' +ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` +if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then + ac_cs_awk_cr='\\r' +else + ac_cs_awk_cr=$ac_cr fi -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -_ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -CEOF$ac_eof +echo 'BEGIN {' >"$tmp/subs1.awk" && _ACEOF +{ + echo "cat >conf$$subs.awk <<_ACEOF" && + echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && + echo "_ACEOF" +} >conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } +ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do - cat >conf$$subs.sed <<_ACEOF -GREP!$GREP$ac_delim -EGREP!$EGREP$ac_delim -LN_S!$LN_S$ac_delim -ECHO!$ECHO$ac_delim -AR!$AR$ac_delim -RANLIB!$RANLIB$ac_delim -DSYMUTIL!$DSYMUTIL$ac_delim -NMEDIT!$NMEDIT$ac_delim -DLLTOOL!$DLLTOOL$ac_delim -AS!$AS$ac_delim -OBJDUMP!$OBJDUMP$ac_delim -CPP!$CPP$ac_delim -CXX!$CXX$ac_delim -CXXFLAGS!$CXXFLAGS$ac_delim -ac_ct_CXX!$ac_ct_CXX$ac_delim -CXXDEPMODE!$CXXDEPMODE$ac_delim -am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim -am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim -CXXCPP!$CXXCPP$ac_delim -F77!$F77$ac_delim -FFLAGS!$FFLAGS$ac_delim -ac_ct_F77!$ac_ct_F77$ac_delim -LIBTOOL!$LIBTOOL$ac_delim -MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim -MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim -MAINT!$MAINT$ac_delim -WEBSITE_HOST!$WEBSITE_HOST$ac_delim -WEBSITE_LOCATION!$WEBSITE_LOCATION$ac_delim -INKSCAPE!$INKSCAPE$ac_delim -HAVE_INKSCAPE_TRUE!$HAVE_INKSCAPE_TRUE$ac_delim -HAVE_INKSCAPE_FALSE!$HAVE_INKSCAPE_FALSE$ac_delim -W3M!$W3M$ac_delim -HAVE_W3M_TRUE!$HAVE_W3M_TRUE$ac_delim -HAVE_W3M_FALSE!$HAVE_W3M_FALSE$ac_delim -SHREXT!$SHREXT$ac_delim -DYNAMICLIB!$DYNAMICLIB$ac_delim -PLATFORM_WIN32_TRUE!$PLATFORM_WIN32_TRUE$ac_delim -PLATFORM_WIN32_FALSE!$PLATFORM_WIN32_FALSE$ac_delim -PATH_SEP!$PATH_SEP$ac_delim -DIR_SEP!$DIR_SEP$ac_delim -MATH_LIB!$MATH_LIB$ac_delim -OS_WIN32_TRUE!$OS_WIN32_TRUE$ac_delim -OS_WIN32_FALSE!$OS_WIN32_FALSE$ac_delim -OS_UNIX_TRUE!$OS_UNIX_TRUE$ac_delim -OS_UNIX_FALSE!$OS_UNIX_FALSE$ac_delim -MMX_EXTRA_CFLAGS!$MMX_EXTRA_CFLAGS$ac_delim -SSE_EXTRA_CFLAGS!$SSE_EXTRA_CFLAGS$ac_delim -ALTIVEC_EXTRA_CFLAGS!$ALTIVEC_EXTRA_CFLAGS$ac_delim -LIBOBJS!$LIBOBJS$ac_delim -LTLIBOBJS!$LTLIBOBJS$ac_delim -_ACEOF + . ./conf$$subs.sh || + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 50; then + ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` + if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} { (exit 1); exit 1; }; } else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi done +rm -f conf$$subs.sh -ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -if test -n "$ac_eof"; then - ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` - ac_eof=`expr $ac_eof + 1` -fi +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +_ACEOF +sed -n ' +h +s/^/S["/; s/!.*/"]=/ +p +g +s/^[^!]*!// +:repl +t repl +s/'"$ac_delim"'$// +t delim +:nl +h +s/\(.\{148\}\).*/\1/ +t more1 +s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ +p +n +b repl +:more1 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t nl +:delim +h +s/\(.\{148\}\).*/\1/ +t more2 +s/["\\]/\\&/g; s/^/"/; s/$/"/ +p +b +:more2 +s/["\\]/\\&/g; s/^/"/; s/$/"\\/ +p +g +s/.\{148\}// +t delim +' >$CONFIG_STATUS || ac_write_fail=1 +rm -f conf$$subs.awk +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +_ACAWK +cat >>"\$tmp/subs1.awk" <<_ACAWK && + for (key in S) S_is_set[key] = 1 + FS = "" + +} +{ + line = $ 0 + nfields = split(line, field, "@") + substed = 0 + len = length(field[1]) + for (i = 2; i < nfields; i++) { + key = field[i] + keylen = length(key) + if (S_is_set[key]) { + value = S[key] + line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) + len += length(value) + length(field[++i]) + substed = 1 + } else + len += 1 + keylen + } + + print line +} -cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACAWK _ACEOF -sed ' -s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -s/^/s,@/; s/!/@,|#_!!_#|/ -:n -t n -s/'"$ac_delim"'$/,g/; t -s/$/\\/; p -N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF -:end -s/|#_!!_#|//g -CEOF$ac_eof +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then + sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" +else + cat +fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ + || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 +$as_echo "$as_me: error: could not setup config files machinery" >&2;} + { (exit 1); exit 1; }; } _ACEOF - # VPATH may cause trouble with some makes, so we remove $(srcdir), # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty @@ -22900,19 +24093,133 @@ s/^[^=]*=[ ]*$// }' fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 fi # test -n "$CONFIG_FILES" +# Set up the scripts for CONFIG_HEADERS section. +# No need to generate them if there are no CONFIG_HEADERS. +# This happens for instance with `./config.status Makefile'. +if test -n "$CONFIG_HEADERS"; then +cat >"$tmp/defines.awk" <<\_ACAWK || +BEGIN { +_ACEOF + +# Transform confdefs.h into an awk script `defines.awk', embedded as +# here-document in config.status, that substitutes the proper values into +# config.h.in to produce config.h. + +# Create a delimiter string that does not exist in confdefs.h, to ease +# handling of long lines. +ac_delim='%!_!# ' +for ac_last_try in false false :; do + ac_t=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_t"; then + break + elif $ac_last_try; then + { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 +$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +# For the awk script, D is an array of macro values keyed by name, +# likewise P contains macro parameters if any. Preserve backslash +# newline sequences. + +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +sed -n ' +s/.\{148\}/&'"$ac_delim"'/g +t rset +:rset +s/^[ ]*#[ ]*define[ ][ ]*/ / +t def +d +:def +s/\\$// +t bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3"/p +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p +d +:bsnl +s/["\\]/\\&/g +s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ +D["\1"]=" \3\\\\\\n"\\/p +t cont +s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p +t cont +d +:cont +n +s/.\{148\}/&'"$ac_delim"'/g +t clear +:clear +s/\\$// +t bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/"/p +d +:bsnlc +s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p +b cont +' >$CONFIG_STATUS || ac_write_fail=1 + +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 + for (key in D) D_is_set[key] = 1 + FS = "" +} +/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { + line = \$ 0 + split(line, arg, " ") + if (arg[1] == "#") { + defundef = arg[2] + mac1 = arg[3] + } else { + defundef = substr(arg[1], 2) + mac1 = arg[2] + } + split(mac1, mac2, "(") #) + macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) + if (D_is_set[macro]) { + # Preserve the white space surrounding the "#". + print prefix "define", macro P[macro] D[macro] + next + } else { + # Replace #undef with comments. This is necessary, for example, + # in the case of _POSIX_SOURCE, which is predefined and required + # on some systems where configure will not decide to define it. + if (defundef == "undef") { + print "/*", prefix defundef, macro, "*/" + next + } + } +} +{ print } +_ACAWK +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 + { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 +$as_echo "$as_me: error: could not setup config headers machinery" >&2;} + { (exit 1); exit 1; }; } +fi # test -n "$CONFIG_HEADERS" + -for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS +eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS" +shift +for ac_tag do case $ac_tag in :[FHLC]) ac_mode=$ac_tag; continue;; esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -echo "$as_me: error: Invalid tag $ac_tag." >&2;} + :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 +$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; @@ -22941,26 +24248,38 @@ echo "$as_me: error: Invalid tag $ac_tag." >&2;} [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} { (exit 1); exit 1; }; };; esac - ac_file_inputs="$ac_file_inputs $ac_f" + case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac + ac_file_inputs="$ac_file_inputs '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't # use $as_me), people would be surprised to read: # /* config.h. Generated by config.status. */ - configure_input="Generated from "`IFS=: - echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + configure_input='Generated from '` + $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' + `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} + { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 +$as_echo "$as_me: creating $ac_file" >&6;} fi + # Neutralize special characters interpreted by sed in replacement strings. + case $configure_input in #( + *\&* | *\|* | *\\* ) + ac_sed_conf_input=`$as_echo "$configure_input" | + sed 's/[\\\\&|]/\\\\&/g'`;; #( + *) ac_sed_conf_input=$configure_input;; + esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin";; + *:-:* | *:-) cat >"$tmp/stdin" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; esac ;; esac @@ -22970,7 +24289,7 @@ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$ac_file" | +$as_echo X"$ac_file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -22996,7 +24315,7 @@ echo X"$ac_file" | as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -23005,7 +24324,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -23026,17 +24345,17 @@ echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } ac_builddir=. case "$ac_dir" in .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; *) - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` case $ac_top_builddir_sub in "") ac_top_builddir_sub=. ac_top_build_prefix= ;; *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; @@ -23074,14 +24393,20 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= -case `sed -n '/datarootdir/ { +ac_sed_dataroot=' +/datarootdir/ { p q } @@ -23090,13 +24415,14 @@ case `sed -n '/datarootdir/ { /@infodir@/p /@localedir@/p /@mandir@/p -' $ac_file_inputs` in +' +case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_datarootdir_hack=' s&@datadir@&$datadir&g s&@docdir@&$docdir&g @@ -23110,15 +24436,16 @@ _ACEOF # Neutralize VPATH when `$srcdir' = `.'. # Shell code in configure.ac might set extrasub. # FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_sed_extra="$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s&@configure_input@&$configure_input&;t t +s|@configure_input@|$ac_sed_conf_input|;t t s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@top_build_prefix@&$ac_top_build_prefix&;t t s&@srcdir@&$ac_srcdir&;t t s&@abs_srcdir@&$ac_abs_srcdir&;t t s&@top_srcdir@&$ac_top_srcdir&;t t @@ -23127,136 +24454,77 @@ s&@builddir@&$ac_builddir&;t t s&@abs_builddir@&$ac_abs_builddir&;t t s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out +" +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 -echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} rm -f "$tmp/stdin" case $ac_file in - -) cat "$tmp/out"; rm -f "$tmp/out";; - *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; - esac + -) cat "$tmp/out" && rm -f "$tmp/out";; + *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + esac \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } ;; :H) # # CONFIG_HEADER # -_ACEOF - -# Transform confdefs.h into a sed script `conftest.defines', that -# substitutes the proper values into config.h.in to produce config.h. -rm -f conftest.defines conftest.tail -# First, append a space to every undef/define line, to ease matching. -echo 's/$/ /' >conftest.defines -# Then, protect against being on the right side of a sed subst, or in -# an unquoted here document, in config.status. If some macros were -# called several times there might be several #defines for the same -# symbol, which is useless. But do not sort them, since the last -# AC_DEFINE must be honored. -ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where -# NAME is the cpp macro being defined, VALUE is the value it is being given. -# PARAMS is the parameter list in the macro definition--in most cases, it's -# just an empty string. -ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*' -ac_dB='\\)[ (].*,\\1define\\2' -ac_dC=' ' -ac_dD=' ,' - -uniq confdefs.h | - sed -n ' - t rset - :rset - s/^[ ]*#[ ]*define[ ][ ]*// - t ok - d - :ok - s/[\\&,]/\\&/g - s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p - s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p - ' >>conftest.defines - -# Remove the space that was appended to ease matching. -# Then replace #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -# (The regexp can be short, since the line contains either #define or #undef.) -echo 's/ $// -s,^[ #]*u.*,/* & */,' >>conftest.defines - -# Break up conftest.defines: -ac_max_sed_lines=50 - -# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" -# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" -# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" -# et cetera. -ac_in='$ac_file_inputs' -ac_out='"$tmp/out1"' -ac_nxt='"$tmp/out2"' - -while : -do - # Write a here document: - cat >>$CONFIG_STATUS <<_ACEOF - # First, check the format of the line: - cat >"\$tmp/defines.sed" <<\\CEOF -/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def -/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def -b -:def -_ACEOF - sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS - ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in - sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail - grep . conftest.tail >/dev/null || break - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines conftest.tail - -echo "ac_result=$ac_in" >>$CONFIG_STATUS -cat >>$CONFIG_STATUS <<\_ACEOF if test x"$ac_file" != x-; then - echo "/* $configure_input */" >"$tmp/config.h" - cat "$ac_result" >>"$tmp/config.h" - if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} + { + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" + } >"$tmp/config.h" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } + if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +$as_echo "$as_me: $ac_file is unchanged" >&6;} else - rm -f $ac_file - mv "$tmp/config.h" $ac_file + rm -f "$ac_file" + mv "$tmp/config.h" "$ac_file" \ + || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 +$as_echo "$as_me: error: could not create $ac_file" >&2;} + { (exit 1); exit 1; }; } fi else - echo "/* $configure_input */" - cat "$ac_result" + $as_echo "/* $configure_input */" \ + && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 +$as_echo "$as_me: error: could not create -" >&2;} + { (exit 1); exit 1; }; } fi - rm -f "$tmp/out12" -# Compute $ac_file's index in $config_headers. +# Compute "$ac_file"'s index in $config_headers. +_am_arg="$ac_file" _am_stamp_count=1 for _am_header in $config_headers :; do case $_am_header in - $ac_file | $ac_file:* ) + $_am_arg | $_am_arg:* ) break ;; * ) _am_stamp_count=`expr $_am_stamp_count + 1` ;; esac done -echo "timestamp for $ac_file" >`$as_dirname -- $ac_file || -$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X$ac_file : 'X\(//\)[^/]' \| \ - X$ac_file : 'X\(//\)$' \| \ - X$ac_file : 'X\(/\)' \| . 2>/dev/null || -echo X$ac_file | +echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" || +$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$_am_arg" : 'X\(//\)[^/]' \| \ + X"$_am_arg" : 'X\(//\)$' \| \ + X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$_am_arg" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -23276,8 +24544,8 @@ echo X$ac_file | s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5 -echo "$as_me: executing $ac_file commands" >&6;} + :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 +$as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -23291,14 +24559,15 @@ echo "$as_me: executing $ac_file commands" >&6;} # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. - # So let's grep whole file. - if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ X"$mf" : 'X\(/\)' \| . 2>/dev/null || -echo X"$mf" | +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -23342,7 +24611,7 @@ $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ X"$file" : 'X\(/\)' \| . 2>/dev/null || -echo X"$file" | +$as_echo X"$file" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -23368,7 +24637,7 @@ echo X"$file" | as_dirs= while :; do case $as_dir in #( - *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( *) as_qdir=$as_dir;; esac as_dirs="'$as_qdir' $as_dirs" @@ -23377,7 +24646,7 @@ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$as_dir" : 'X\(//\)[^/]' \| \ X"$as_dir" : 'X\(//\)$' \| \ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -echo X"$as_dir" | +$as_echo X"$as_dir" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -23398,8 +24667,8 @@ echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -echo "$as_me: error: cannot create directory $as_dir" >&2;} + } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} { (exit 1); exit 1; }; }; } # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" @@ -23416,6 +24685,11 @@ _ACEOF chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save +test $ac_write_fail = 0 || + { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 +$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -23437,4 +24711,8 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi diff --git a/configure.ac b/configure.ac index 0566aca..1146bb4 100644 --- a/configure.ac +++ b/configure.ac @@ -13,8 +13,8 @@ AC_PREREQ(2.54) m4_define([babl_major_version], 0) -m4_define([babl_minor_version], 0) -m4_define([babl_micro_version], 22) +m4_define([babl_minor_version], 1) +m4_define([babl_micro_version], 0) m4_define([babl_real_version], [babl_major_version.babl_minor_version.babl_micro_version]) m4_define([babl_version], [babl_real_version]) @@ -25,7 +25,7 @@ m4_define([babl_binary_age], [m4_eval(100 * babl_minor_version + babl_micro_version)]) # This is the X.Y used in -lbabl-X.Y -m4_define([babl_api_version], [babl_major_version.babl_minor_version]) +m4_define([babl_api_version], [babl_major_version.0]) m4_define([stability_version_number], m4_if(m4_eval(babl_major_version || babl_minor_version), [0], @@ -89,6 +89,8 @@ dnl ========================================================================== AM_INIT_AUTOMAKE(no-define) AM_CONFIG_HEADER(config.h) +BABL_VARIADIC_MACROS + AC_DISABLE_STATIC AC_PROG_CC AC_LIBTOOL_WIN32_DLL @@ -111,7 +113,6 @@ if eval "test x$GCC = xyes"; then *[\ \ ]-Wall[\ \ ]*) ;; *) CFLAGS="$CFLAGS -Wall" ;; esac -fi BABL_DETECT_CFLAGS(extra_warnings, '-Wdeclaration-after-statement') CFLAGS="$CFLAGS $extra_warnings" @@ -131,9 +132,10 @@ CFLAGS="$CFLAGS $extra_warnings" BABL_DETECT_CFLAGS(extra_warnings, '-Wold-style-definition') CFLAGS="$CFLAGS $extra_warnings" +fi -AC_PATH_PROG(INKSCAPE, inkscape, no) -AM_CONDITIONAL(HAVE_INKSCAPE, test "x$INKSCAPE" != "xno") +AC_PATH_PROG(RSVG, rsvg, no) +AM_CONDITIONAL(HAVE_RSVG, test "x$RSVG" != "xno") AC_PATH_PROG(W3M, w3m, no) AM_CONDITIONAL(HAVE_W3M, test "x$W3M" != "xno") @@ -175,22 +177,22 @@ case "$target_or_host" in esac -#################################################### -# Check how to generate plug-ins (with gcc at least) -#################################################### +############################ +# Check how to find plug-ins +############################ AC_MSG_CHECKING([for some Win32 platform]) case "$target_or_host" in *-*-darwin*) # darwin shrext=.dylib - dynamiclib=-dynamiclib + ;; + hppa*-hpux*) # HP/UX + shrext=.sl ;; *-*-mingw* | *-*-cygwin*) # windows shrext=.dll - dynamiclib=-shared ;; *) # linux (and BSD?) - dynamiclib=-shared shrext=.so ;; esac @@ -199,10 +201,6 @@ SHREXT=$shrext AC_SUBST(SHREXT) AC_DEFINE_UNQUOTED(SHREXT, "$shrext", [File extension for shared libraries]) -DYNAMICLIB=$dynamiclib -AC_SUBST(DYNAMICLIB) -AC_DEFINE_UNQUOTED(DYNAMICLIB, "$dynamiclib", [Dynamic shared library]) - dnl =========================================================================== ################# @@ -365,6 +363,8 @@ fi dnl =========================================================================== +AC_CHECK_HEADERS(dl.h) + AC_SEARCH_LIBS([dlopen], [dl]) AC_SEARCH_LIBS([rint], [m]) diff --git a/depcomp b/depcomp index 04701da..e5f9736 100755 --- a/depcomp +++ b/depcomp @@ -1,9 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-07-09.11 +scriptversion=2007-03-29.01 -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software +# Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -91,7 +92,20 @@ gcc3) ## gcc 3 implements dependency tracking that does exactly what ## we want. Yay! Note: for some reason libtool 1.4 doesn't like ## it if -MD -MP comes after the -MF stuff. Hmm. - "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" +## Unfortunately, FreeBSD c89 acceptance of flags depends upon +## the command line argument order; so add the flags where they +## appear in depend2.am. Note that the slowdown incurred here +## affects only configure: in makefiles, %FASTDEP% shortcuts this. + for arg + do + case $arg in + -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;; + *) set fnord "$@" "$arg" ;; + esac + shift # fnord + shift # $arg + done + "$@" stat=$? if test $stat -eq 0; then : else @@ -201,34 +215,39 @@ aix) # current directory. Also, the AIX compiler puts `$object:' at the # start of each line; $object doesn't have directory information. # Version 6 uses the directory in both cases. - stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'` - tmpdepfile="$stripped.u" + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` if test "$libtool" = yes; then + tmpdepfile1=$dir$base.u + tmpdepfile2=$base.u + tmpdepfile3=$dir.libs/$base.u "$@" -Wc,-M else + tmpdepfile1=$dir$base.u + tmpdepfile2=$dir$base.u + tmpdepfile3=$dir$base.u "$@" -M fi stat=$? - if test -f "$tmpdepfile"; then : - else - stripped=`echo "$stripped" | sed 's,^.*/,,'` - tmpdepfile="$stripped.u" - fi - if test $stat -eq 0; then : else - rm -f "$tmpdepfile" + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" exit $stat fi + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" + do + test -f "$tmpdepfile" && break + done if test -f "$tmpdepfile"; then - outname="$stripped.o" # Each line is of the form `foo.o: dependent.h'. # Do two passes, one to just change these to # `$object: dependent.h' and one to simply `dependent.h:'. - sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile" - sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile" + sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" + # That's a tab and a space in the []. + sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -276,6 +295,46 @@ icc) rm -f "$tmpdepfile" ;; +hp2) + # The "hp" stanza above does not work with aCC (C++) and HP's ia64 + # compilers, which have integrated preprocessors. The correct option + # to use with these is +Maked; it writes dependencies to a file named + # 'foo.d', which lands next to the object file, wherever that + # happens to be. + # Much of this is similar to the tru64 case; see comments there. + dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` + test "x$dir" = "x$object" && dir= + base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` + if test "$libtool" = yes; then + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir.libs/$base.d + "$@" -Wc,+Maked + else + tmpdepfile1=$dir$base.d + tmpdepfile2=$dir$base.d + "$@" +Maked + fi + stat=$? + if test $stat -eq 0; then : + else + rm -f "$tmpdepfile1" "$tmpdepfile2" + exit $stat + fi + + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" + do + test -f "$tmpdepfile" && break + done + if test -f "$tmpdepfile"; then + sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" + # Add `dependent.h:' lines. + sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + else + echo "#dummy" > "$depfile" + fi + rm -f "$tmpdepfile" "$tmpdepfile2" + ;; + tru64) # The Tru64 compiler uses -MD to generate dependencies as a side # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. @@ -288,13 +347,13 @@ tru64) if test "$libtool" = yes; then # With Tru64 cc, shared objects can also be used to make a - # static library. This mecanism is used in libtool 1.4 series to + # static library. This mechanism is used in libtool 1.4 series to # handle both shared and static libraries in a single compilation. # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. # # With libtool 1.5 this exception was removed, and libtool now # generates 2 separate objects for the 2 libraries. These two - # compilations output dependencies in in $dir.libs/$base.o.d and + # compilations output dependencies in $dir.libs/$base.o.d and # in $dir$base.o.d. We have to check for both files, because # one of the two compilations can be disabled. We should prefer # $dir$base.o.d over $dir.libs/$base.o.d because the latter is diff --git a/docs/Makefile.am b/docs/Makefile.am index c8c2b5b..6c26d32 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,7 +1,7 @@ # programs used for doc creation babl_fish_path_dhtml = $(top_builddir)/tests/babl_fish_path_dhtml babl_fish_path_fitness = $(top_builddir)/tests/babl_fish_path_fitness -babl_html_dump = $(top_builddir)/tests/babl_html_dump +babl_html_dump = $(top_builddir)/tests/babl-html-dump .SILENT: SUBDIRS= graphics @@ -35,13 +35,13 @@ all: $(HTML_FILES) rss BablFishPath.html: $(babl_fish_path_dhtml) echo -n "HTML:" echo -n " $@" - export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\ + export BABL_PATH="$(top_builddir)/extensions:$(top_builddir)/extensions/.libs"; $< > $@ &&\ echo " [OK]" || echo " Fail" BablFishPath.txt: $(babl_fish_path_fitness) echo -n "UTF8:" echo -n " $@" - export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\ + export BABL_PATH="$(top_builddir)/extensions:$(top_builddir)/extensions/.libs"; $< > $@ &&\ echo " [OK]" || echo " Fail" if [ "x"$$CRUCIBLE_ID != "x" ] ;then echo;echo;cat $@;echo;echo;fi @@ -54,16 +54,16 @@ index.html: index-static.html \ Makefile.am echo -n "HTML: $@" cp $< $@ - (which mktemp > /dev/null&& TMPFILE=`mktemp` || TMPFILE="/tmp/babl_build_tempfile" ;\ - export BABL_PATH="$(top_builddir)/extensions"; $(babl_html_dump) > $$TMPFILE;\ - $(top_srcdir)/docs/tools/xml_insert.sh $@ BablBase $$TMPFILE;\ + (which mktemp > /dev/null 2>&1 && TMPFILE=`mktemp` || TMPFILE="/tmp/babl_build_tempfile" ;\ + export BABL_PATH="$(top_builddir)/extensions:$(top_builddir)/extensions/.libs"; $(babl_html_dump) > $$TMPFILE;\ + $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ BablBase $$TMPFILE;\ rm -f $$TMPFILE ) echo -n "." - $(top_srcdir)/docs/tools/xml_insert.sh $@ BablFishPath BablFishPath.txt - $(top_srcdir)/docs/tools/xml_insert.sh $@ AUTHORS $(top_srcdir)/AUTHORS - $(top_srcdir)/docs/tools/xml_insert.sh $@ TODO $(top_srcdir)/TODO - $(top_srcdir)/docs/tools/xml_insert.sh $@ NEWS $(top_srcdir)/NEWS + $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ BablFishPath BablFishPath.txt + $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ AUTHORS $(top_srcdir)/AUTHORS + $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ TODO $(top_srcdir)/TODO + $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ NEWS $(top_srcdir)/NEWS echo " [OK]" distclean-local: diff --git a/docs/Makefile.in b/docs/Makefile.in index 9d51ccf..986b822 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -50,17 +46,18 @@ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ html-recursive info-recursive install-data-recursive \ - install-exec-recursive install-info-recursive \ - install-recursive installcheck-recursive installdirs-recursive \ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive + install-dvi-recursive install-exec-recursive \ + install-html-recursive install-info-recursive \ + install-pdf-recursive install-ps-recursive install-recursive \ + installcheck-recursive installdirs-recursive pdf-recursive \ + ps-recursive uninstall-recursive +RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ + distclean-recursive maintainer-clean-recursive ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -79,8 +76,6 @@ BABL_MINOR_VERSION = @BABL_MINOR_VERSION@ BABL_REAL_VERSION = @BABL_REAL_VERSION@ BABL_RELEASE = @BABL_RELEASE@ BABL_UNSTABLE = @BABL_UNSTABLE@ -BABL_UNSTABLE_FALSE = @BABL_UNSTABLE_FALSE@ -BABL_UNSTABLE_TRUE = @BABL_UNSTABLE_TRUE@ BABL_VERSION = @BABL_VERSION@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -97,7 +92,6 @@ DEPDIR = @DEPDIR@ DIR_SEP = @DIR_SEP@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ -DYNAMICLIB = @DYNAMICLIB@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -107,11 +101,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ -HAVE_INKSCAPE_FALSE = @HAVE_INKSCAPE_FALSE@ -HAVE_INKSCAPE_TRUE = @HAVE_INKSCAPE_TRUE@ -HAVE_W3M_FALSE = @HAVE_W3M_FALSE@ -HAVE_W3M_TRUE = @HAVE_W3M_TRUE@ -INKSCAPE = @INKSCAPE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -123,18 +113,13 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MATH_LIB = @MATH_LIB@ +MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_UNIX_FALSE = @OS_UNIX_FALSE@ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -143,9 +128,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEP = @PATH_SEP@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +RSVG = @RSVG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -156,13 +140,13 @@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ WEBSITE_LOCATION = @WEBSITE_LOCATION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -174,6 +158,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -201,13 +186,17 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ # programs used for doc creation babl_fish_path_dhtml = $(top_builddir)/tests/babl_fish_path_dhtml babl_fish_path_fitness = $(top_builddir)/tests/babl_fish_path_fitness -babl_html_dump = $(top_builddir)/tests/babl_html_dump +babl_html_dump = $(top_builddir)/tests/babl-html-dump SUBDIRS = graphics DIST_SUBDIRS = graphics @@ -272,10 +261,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -307,8 +292,7 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: +$(RECURSIVE_CLEAN_TARGETS): @failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ @@ -352,8 +336,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -378,8 +362,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -389,13 +373,12 @@ ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -409,23 +392,21 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/tools - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -439,7 +420,7 @@ distdir: $(DISTFILES) list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ - || $(mkdir_p) "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ distdir=`$(am__cd) $(distdir) && pwd`; \ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ @@ -447,6 +428,8 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$$top_distdir" \ distdir="$$distdir/$$subdir" \ + am__remove_distdir=: \ + am__skip_length_check=: \ distdir) \ || exit 1; \ fi; \ @@ -488,8 +471,8 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-recursive -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool \ - distclean-local distclean-tags +distclean-am: clean-am distclean-generic distclean-local \ + distclean-tags dvi: dvi-recursive @@ -503,12 +486,20 @@ info-am: install-data-am: +install-dvi: install-dvi-recursive + install-exec-am: +install-html: install-html-recursive + install-info: install-info-recursive install-man: +install-pdf: install-pdf-recursive + +install-ps: install-ps-recursive + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -527,22 +518,24 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-info-am +uninstall-am: -uninstall-info: uninstall-info-recursive +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ + install-strip -.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \ - clean clean-generic clean-libtool clean-recursive ctags \ - ctags-recursive distclean distclean-generic distclean-libtool \ - distclean-local distclean-recursive distclean-tags distdir dvi \ +.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ + all all-am check check-am clean clean-generic clean-libtool \ + ctags ctags-recursive distclean distclean-generic \ + distclean-libtool distclean-local distclean-tags distdir dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic \ - maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-info-am + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-recursive uninstall uninstall-am .SILENT: @@ -552,13 +545,13 @@ all: $(HTML_FILES) rss BablFishPath.html: $(babl_fish_path_dhtml) echo -n "HTML:" echo -n " $@" - export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\ + export BABL_PATH="$(top_builddir)/extensions:$(top_builddir)/extensions/.libs"; $< > $@ &&\ echo " [OK]" || echo " Fail" BablFishPath.txt: $(babl_fish_path_fitness) echo -n "UTF8:" echo -n " $@" - export BABL_PATH="$(top_builddir)/extensions"; $< > $@ &&\ + export BABL_PATH="$(top_builddir)/extensions:$(top_builddir)/extensions/.libs"; $< > $@ &&\ echo " [OK]" || echo " Fail" if [ "x"$$CRUCIBLE_ID != "x" ] ;then echo;echo;cat $@;echo;echo;fi @@ -571,16 +564,16 @@ index.html: index-static.html \ Makefile.am echo -n "HTML: $@" cp $< $@ - (which mktemp > /dev/null&& TMPFILE=`mktemp` || TMPFILE="/tmp/babl_build_tempfile" ;\ - export BABL_PATH="$(top_builddir)/extensions"; $(babl_html_dump) > $$TMPFILE;\ - $(top_srcdir)/docs/tools/xml_insert.sh $@ BablBase $$TMPFILE;\ + (which mktemp > /dev/null 2>&1 && TMPFILE=`mktemp` || TMPFILE="/tmp/babl_build_tempfile" ;\ + export BABL_PATH="$(top_builddir)/extensions:$(top_builddir)/extensions/.libs"; $(babl_html_dump) > $$TMPFILE;\ + $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ BablBase $$TMPFILE;\ rm -f $$TMPFILE ) echo -n "." - $(top_srcdir)/docs/tools/xml_insert.sh $@ BablFishPath BablFishPath.txt - $(top_srcdir)/docs/tools/xml_insert.sh $@ AUTHORS $(top_srcdir)/AUTHORS - $(top_srcdir)/docs/tools/xml_insert.sh $@ TODO $(top_srcdir)/TODO - $(top_srcdir)/docs/tools/xml_insert.sh $@ NEWS $(top_srcdir)/NEWS + $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ BablFishPath BablFishPath.txt + $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ AUTHORS $(top_srcdir)/AUTHORS + $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ TODO $(top_srcdir)/TODO + $(SHELL) $(top_srcdir)/docs/tools/xml_insert.sh $@ NEWS $(top_srcdir)/NEWS echo " [OK]" distclean-local: diff --git a/docs/graphics/Makefile.am b/docs/graphics/Makefile.am index c630ef2..b72c9b0 100644 --- a/docs/graphics/Makefile.am +++ b/docs/graphics/Makefile.am @@ -1,6 +1,6 @@ .SILENT: -if HAVE_INKSCAPE +if HAVE_RSVG PNG_FILES = \ babl-a4poster.png \ babl-16x16.png \ @@ -21,18 +21,18 @@ MAINTAINERCLEANFILES = $(PNG_FILES) all: $(MAINTAINERCLEANFILES) -INKSCAPE_CMD = echo -n " SVG: $@" ;\ - $(INKSCAPE) -e $@ $< 2&>/dev/null\ +RSVG_CMD = echo -n " SVG: $@" ;\ + $(RSVG) $< $@\ &&\ echo " [OK]"\ ||\ echo " FAIL" -if HAVE_INKSCAPE -dist-check-inkscape: +if HAVE_RSVG +dist-check-rsvg: %.png: %.svg - $(INKSCAPE_CMD) + $(RSVG_CMD) #-e $@ $< 2>/dev/null # the png version of the a4 poster is used as a webgraphic @@ -40,16 +40,16 @@ dist-check-inkscape: # 0.0 babl-a4poster.png: babl-a4poster.svg echo -n " SVG: $@" ;\ - $(INKSCAPE) -e $@ $< -w 256 -y 0 2&>/dev/null\ + $(RSVG) -w 256 $< $@\ &&\ echo " [OK]"\ ||\ echo " FAIL" else -dist-check-inkscape: - @echo "*** inkscape must be available in order to make dist" +dist-check-rsvg: + @echo "*** rsvg must be available in order to make dist" @false endif -dist-hook: dist-check-inkscape +dist-hook: dist-check-rsvg diff --git a/docs/graphics/Makefile.in b/docs/graphics/Makefile.in index 0be84da..1642ae2 100644 --- a/docs/graphics/Makefile.in +++ b/docs/graphics/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,15 +13,11 @@ # PARTICULAR PURPOSE. @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../.. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -50,8 +46,6 @@ DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -70,8 +64,6 @@ BABL_MINOR_VERSION = @BABL_MINOR_VERSION@ BABL_REAL_VERSION = @BABL_REAL_VERSION@ BABL_RELEASE = @BABL_RELEASE@ BABL_UNSTABLE = @BABL_UNSTABLE@ -BABL_UNSTABLE_FALSE = @BABL_UNSTABLE_FALSE@ -BABL_UNSTABLE_TRUE = @BABL_UNSTABLE_TRUE@ BABL_VERSION = @BABL_VERSION@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -88,7 +80,6 @@ DEPDIR = @DEPDIR@ DIR_SEP = @DIR_SEP@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ -DYNAMICLIB = @DYNAMICLIB@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -98,11 +89,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ -HAVE_INKSCAPE_FALSE = @HAVE_INKSCAPE_FALSE@ -HAVE_INKSCAPE_TRUE = @HAVE_INKSCAPE_TRUE@ -HAVE_W3M_FALSE = @HAVE_W3M_FALSE@ -HAVE_W3M_TRUE = @HAVE_W3M_TRUE@ -INKSCAPE = @INKSCAPE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -114,18 +101,13 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MATH_LIB = @MATH_LIB@ +MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_UNIX_FALSE = @OS_UNIX_FALSE@ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -134,9 +116,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEP = @PATH_SEP@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +RSVG = @RSVG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -147,13 +128,13 @@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ WEBSITE_LOCATION = @WEBSITE_LOCATION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -165,6 +146,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -192,12 +174,16 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@HAVE_INKSCAPE_TRUE@PNG_FILES = \ -@HAVE_INKSCAPE_TRUE@ babl-a4poster.png \ -@HAVE_INKSCAPE_TRUE@ babl-16x16.png \ -@HAVE_INKSCAPE_TRUE@ babl-48x48.png +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@HAVE_RSVG_TRUE@PNG_FILES = \ +@HAVE_RSVG_TRUE@ babl-a4poster.png \ +@HAVE_RSVG_TRUE@ babl-16x16.png \ +@HAVE_RSVG_TRUE@ babl-48x48.png SVG_FILES = \ babl-a4poster.svg \ @@ -210,8 +196,8 @@ EXTRA_DIST = \ $(SVG_FILES) MAINTAINERCLEANFILES = $(PNG_FILES) -INKSCAPE_CMD = echo -n " SVG: $@" ;\ - $(INKSCAPE) -e $@ $< 2&>/dev/null\ +RSVG_CMD = echo -n " SVG: $@" ;\ + $(RSVG) $< $@\ &&\ echo " [OK]"\ ||\ @@ -255,10 +241,6 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs - -distclean-libtool: - -rm -f libtool -uninstall-info-am: tags: TAGS TAGS: @@ -267,22 +249,21 @@ CTAGS: distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -331,7 +312,7 @@ clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-generic dvi: dvi-am @@ -345,12 +326,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -369,43 +358,47 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: all all-am check check-am clean clean-generic clean-libtool \ dist-hook distclean distclean-generic distclean-libtool \ distdir dvi dvi-am html html-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-info install-info-am install-man \ + install-am install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am + uninstall uninstall-am .SILENT: all: $(MAINTAINERCLEANFILES) -@HAVE_INKSCAPE_TRUE@dist-check-inkscape: +@HAVE_RSVG_TRUE@dist-check-rsvg: -@HAVE_INKSCAPE_TRUE@%.png: %.svg -@HAVE_INKSCAPE_TRUE@ $(INKSCAPE_CMD) +@HAVE_RSVG_TRUE@%.png: %.svg +@HAVE_RSVG_TRUE@ $(RSVG_CMD) #-e $@ $< 2>/dev/null # the png version of the a4 poster is used as a webgraphic # , thus it is rendered with the background alpha set to # 0.0 -@HAVE_INKSCAPE_TRUE@babl-a4poster.png: babl-a4poster.svg -@HAVE_INKSCAPE_TRUE@ echo -n " SVG: $@" ;\ -@HAVE_INKSCAPE_TRUE@ $(INKSCAPE) -e $@ $< -w 256 -y 0 2&>/dev/null\ -@HAVE_INKSCAPE_TRUE@ &&\ -@HAVE_INKSCAPE_TRUE@ echo " [OK]"\ -@HAVE_INKSCAPE_TRUE@ ||\ -@HAVE_INKSCAPE_TRUE@ echo " FAIL" -@HAVE_INKSCAPE_FALSE@dist-check-inkscape: -@HAVE_INKSCAPE_FALSE@ @echo "*** inkscape must be available in order to make dist" -@HAVE_INKSCAPE_FALSE@ @false - -dist-hook: dist-check-inkscape +@HAVE_RSVG_TRUE@babl-a4poster.png: babl-a4poster.svg +@HAVE_RSVG_TRUE@ echo -n " SVG: $@" ;\ +@HAVE_RSVG_TRUE@ $(RSVG) -w 256 $< $@\ +@HAVE_RSVG_TRUE@ &&\ +@HAVE_RSVG_TRUE@ echo " [OK]"\ +@HAVE_RSVG_TRUE@ ||\ +@HAVE_RSVG_TRUE@ echo " FAIL" +@HAVE_RSVG_FALSE@dist-check-rsvg: +@HAVE_RSVG_FALSE@ @echo "*** rsvg must be available in order to make dist" +@HAVE_RSVG_FALSE@ @false + +dist-hook: dist-check-rsvg # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/docs/graphics/babl-16x16.png b/docs/graphics/babl-16x16.png index 1df6deebcf15a81f76e228dac477673b5aabf198..37eb53a63d8d5c676f812cec59c053ab38fc9495 100644 GIT binary patch delta 478 zcmV<40U`dY1o#7xB!32COGiWi{{a60|De66lK=n#tw}^dR5*?8k~?ctVE~4o^Igs{ zNprCsMDRjvC~3L~4obo5P&@b|98{FzB7*n_1b2tpMT?W*Aarq35Zw|?K?nvc^b#SF z2tA1;^?c`??{h2YW)~Nq{dwVidEs9p58((ZT&Ku6LYnHY)PF^a40*|rvsh*TehVny zEMLs#vP*u}KdCc%Quw0hwCh;UzG~cSv;~k7Ry)b>HHd{NBFXWjl97W|7>l^Es#9&f`NeodM z5fNdvB{2!({#dcg3jmJ=t|_gamx?9ktMjzKwTWzm3KYT@kOAjAL{^}4nyrm3JKh*lD}(HVHky< z?|$$5-FuUJ!6Bs}RuB;^1~cf8MFgQ8nj)QaauWOlM3*Xb&wuEwo8S-%74;7&BGjO? zQmK?+S`?yk(Gt=cLw&c_pBE-YAQzu@@j#XnxXx%w96K8{(GhyI=41~6HcU1?>l z+qIS2#N_eG@qgvUGV7n$3F8p!EM7e$JEH5mZ`NL{6?>n0Bih{cuYDCDXl^&FOSPr* zbEUcQ`ja~Im*+{MgfvP?qm)P@)GCoirQ(I6wK)sQ;CG3O^~INCr^aXx+EgkPHkupk z?e5X(bm;7M=ytpGdwu$YK1K}bu{1!rYD&fc7%nm+PJf=oxtQ|lGF#ua5Ea5WBya&Z z@ah@5AwKprRvN?o7`OZ@f6sXD(J5W9Y8OPsSh0u*>J$kDlQU>u(Y*F{zVAHG-e>1% zGu&6z{90l(6P*#2>sIU~Ywgh>2#!cBUnP;2OWadU^ugwx%?}4&`+rXP-vayu*=LnI URK#cb01E&B07*qoM6N<$f|1|$ng9R* diff --git a/docs/graphics/babl-48x48.png b/docs/graphics/babl-48x48.png index ec41b07155d0daec1c520c5f06128e747a9459f0..21c189ba74739fbb1a86dd2538698c18d54d060f 100644 GIT binary patch delta 1853 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Ðv*?C}EjR&FI<)R>l~p#TDxY+h8lNz+!ifiB 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 diff --git a/docs/index-static.html.in b/docs/index-static.html.in index 3d8b888..75b4bdb 100644 --- a/docs/index-static.html.in +++ b/docs/index-static.html.in @@ -156,10 +156,10 @@ ftp://ftp.gtk.org/pub/babl/.

-

Babl development happens in GNOME Subversion in the babl module. - It can be browsed online and checked out with: +

Babl uses git. The main repository is hosted by GNOME. + It can be browsed online and cloned with:

- 
svn co http://svn.gnome.org/svn/babl/trunk/ babl
+ 
git clone git://git.gnome.org/babl

The following is a list of the major changes that have gone into each babl release. If there are significant improvements to babl when @@ -167,7 +167,7 @@ to the GEGL release.

- For more news see the current ChangeLog in subversion. + For more news see git log.

Documentation

@@ -324,7 +324,7 @@ lab_buffer = malloc (pixel_count * 3 * 4);

Extending

For samples of how the current internal API specification of - data types, color models, and conversions look in the extensions/ + data types, color models, and conversions look in the extensions/ directory. The tables in this HTML file is directly generated based on the data registered by BablCore (double and RGBA), BablBase (core datatypes, and RGB models), extensions (CIE Lab, naive CMYK, diff --git a/docs/tools/xml_insert.sh b/docs/tools/xml_insert.sh index 139bd15..16b6b24 100755 --- a/docs/tools/xml_insert.sh +++ b/docs/tools/xml_insert.sh @@ -11,13 +11,93 @@ # # FIXME: add argument checking / error handling -which tempfile > /dev/null && TMP_FILE=`tempfile` || TMP_FILE="/tmp/temp_file" +: ${AWK="awk"} +: ${ECHO="echo"} +: ${MKDIR="mkdir"} +: ${SED="sed"} +: ${Xsed="$SED -e 1s/^X//"} -cp $1 $TMP_FILE +# Global variables: +EXIT_SUCCESS=0 +EXIT_FAILURE=1 -SPLIT=`grep -n "<\!--$2-->" $TMP_FILE|head -n 1|sed -e "s/:.*//"`; -head -n $SPLIT $TMP_FILE > $1 +dirname="s,/[[^/]]*$,," +basename="s,^.*/,," + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + +# The name of this program: +# In the unlikely event $progname began with a '-', it would play havoc with +# func_echo (imagine progname=-n), so we prepend ./ in that case: +progname=`$ECHO "X$progpath" | $Xsed -e "$basename" -e 's,^-,./-,'` + +# func_error arg... +# Echo program name prefixed message to standard error. +func_error () +{ + $ECHO "$progname: "${1+"$@"} 1>&2 +} + +# func_fatal_error arg... +# Echo program name prefixed message to standard error, and exit. +func_fatal_error () +{ + func_error ${1+"$@"} + exit $EXIT_FAILURE +} + +# func_mktempdir [string] +# Make a temporary directory that won't clash with other running +# processes, and avoids race conditions if possible. If +# given, STRING is the basename for that directory. +func_mktempdir () +{ + my_template="${TMPDIR-/tmp}/${1-$progname}" + + if test "$opt_dry_run" = ":"; then + # Return a directory name, but don't create it in dry-run mode + my_tmpdir="${my_template}-$$" + else + + # If mktemp works, use that first and foremost + my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null` + + if test ! -d "$my_tmpdir"; then + # Failing that, at least try and use $RANDOM to avoid a race + my_tmpdir="${my_template}-${RANDOM-0}$$" + + save_mktempdir_umask=`umask` + umask 0077 + $MKDIR "$my_tmpdir" + umask $save_mktempdir_umask + fi + + # If we're not in dry-run mode, bomb out on failure + test -d "$my_tmpdir" || \ + func_fatal_error "cannot create temporary directory \`$my_tmpdir'" + fi + + $ECHO "X$my_tmpdir" | $Xsed +} + +tmp_dir="`func_mktempdir`" +tmp_file="$tmp_dir/one" + +cp $1 $tmp_file + +numlines=`wc -l $tmp_file | $AWK '{print $1;}'` +splitno=`$AWK "/<\!--$2-->/ { print NR; exit 0; }" $tmp_file` +tailno=`expr $numlines - $splitno` + +head -$splitno $tmp_file > $1 cat $3 >> $1 -tail -n $((`wc -l $TMP_FILE | sed -e "s/ .*//"` - $SPLIT )) $TMP_FILE >> $1 +tail -$tailno $tmp_file >> $1 + +rm -rf $tmp_dir -rm $TMP_FILE +exit $? diff --git a/extensions/CIE-Lab.c b/extensions/CIE-Lab.c index 47cbbd5..855d716 100644 --- a/extensions/CIE-Lab.c +++ b/extensions/CIE-Lab.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include @@ -394,8 +395,8 @@ convert_u8_double_scaled (double min_val, /* source ICC.1:2004-10 */ -MAKE_CONVERSIONS (u8_l, 0.0, 100.0, 0x00, 0xff); -MAKE_CONVERSIONS (u8_ab, -128.0, 127.0, 0x00, 0xff); +MAKE_CONVERSIONS (u8_l, 0.0, 100.0, 0x00, 0xff) +MAKE_CONVERSIONS (u8_ab, -128.0, 127.0, 0x00, 0xff) #undef MAKE_CONVERSIONS @@ -531,8 +532,8 @@ convert_u16_double_scaled (double min_val, src, dst, src_pitch, dst_pitch, n); \ } -MAKE_CONVERSIONS (u16_l, 0.0, 100.0, 0x00, 0xffff); -MAKE_CONVERSIONS (u16_ab, -128.0, 127.0, 0x00, 0xffff); +MAKE_CONVERSIONS (u16_l, 0.0, 100.0, 0x00, 0xffff) +MAKE_CONVERSIONS (u16_ab, -128.0, 127.0, 0x00, 0xffff) #undef MAKE_CONVERSIONS diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 2510a93..77ecabc 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -1,60 +1,27 @@ -# General minimalistic compile file for self contained single -# file babl_extensions - -if OS_WIN32 -no_undefined = -no-undefined -libbabldlla=$(top_builddir)/babl/.libs/libbabl-$(BABL_API_VERSION).dll.a -endif - -CFILES = $(wildcard $(srcdir)/*.c) -SOBJS = $(subst $(srcdir)/,,$(CFILES:.c=$(SHREXT))) -INSTALLED_ITEMS = $(subst $(srcdir),$(ext_dir),$(CFILES:.c=$(SHREXT))) -EXTRA_DIST = $(wildcard *.[ch]) - -all-local: $(SOBJS) - -CFLAGS += \ - -I $(top_builddir) \ - -I $(top_srcdir) \ - -I $(top_srcdir)/babl \ - -I $(top_srcdir)/extensions \ - -fPIC - -LDFLAGS += $(DYNAMICLIB) - if OS_WIN32 -LDADD = $(no-undefined) $(libbabldlla) $(MATH_LIB) +AM_LDFLAGS = -module -no-undefined else -LDADD = $(top_builddir)/babl/.libs/libbabl-$(BABL_API_VERSION)$(SHREXT) $(MATH_LIB) +AM_LDFLAGS = -module endif -%$(SHREXT): %.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) - -# if extension needing external libraries are to be # compiled with this make -# file, each of them can be added according to the this pattern: -# extra$(SHREXT): extra.c -# $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< [own compile and link flags] - -CIE-Lab$(SHREXT): CIE-Lab.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) - -sse-fixups$(SHREXT): sse-fixups.c - $(CC) $(CFLAGS) $(MMX_EXTRA_CFLAGS) $(SSE_EXTRA_CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) -#lcms$(SHREXT): lcms.c -# $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs` -############################################################################# - -clean-local: - rm -f $(SOBJS) +noinst_HEADERS = util.h -ext_dir = $(DESTDIR)$(libdir)/babl-@BABL_API_VERSION@ +AM_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/babl \ + -I$(top_srcdir)/extensions -install-exec-local: all-local - $(INSTALL) -d $(ext_dir) - $(INSTALL) $(SOBJS) $(ext_dir) +extdir = $(DESTDIR)$(libdir)/babl-@BABL_API_VERSION@ +ext_LTLIBRARIES = \ + CIE-Lab.la \ + gegl-fixups.la \ + gggl-lies.la \ + gggl.la \ + gimp-8bit.la \ + naive-CMYK.la \ + sse-fixups.la -uninstall-local: - rm -f $(INSTALLED_ITEMS) +LIBS = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la $(MATH_LIB) -check-local: all-local +sse_fixups_la_CFLAGS = $(MMX_EXTRA_CFLAGS) $(SSE_EXTRA_CFLAGS) diff --git a/extensions/Makefile.in b/extensions/Makefile.in index 17a011e..6c91916 100644 --- a/extensions/Makefile.in +++ b/extensions/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,17 +14,12 @@ @SET_MAKE@ -# General minimalistic compile file for self contained single -# file babl_extensions -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ + VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -39,7 +34,8 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = extensions -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac @@ -48,13 +44,61 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -SOURCES = -DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(extdir)" +extLTLIBRARIES_INSTALL = $(INSTALL) +LTLIBRARIES = $(ext_LTLIBRARIES) +CIE_Lab_la_LIBADD = +CIE_Lab_la_SOURCES = CIE-Lab.c +CIE_Lab_la_OBJECTS = CIE-Lab.lo +gegl_fixups_la_LIBADD = +gegl_fixups_la_SOURCES = gegl-fixups.c +gegl_fixups_la_OBJECTS = gegl-fixups.lo +gggl_lies_la_LIBADD = +gggl_lies_la_SOURCES = gggl-lies.c +gggl_lies_la_OBJECTS = gggl-lies.lo +gggl_la_LIBADD = +gggl_la_SOURCES = gggl.c +gggl_la_OBJECTS = gggl.lo +gimp_8bit_la_LIBADD = +gimp_8bit_la_SOURCES = gimp-8bit.c +gimp_8bit_la_OBJECTS = gimp-8bit.lo +naive_CMYK_la_LIBADD = +naive_CMYK_la_SOURCES = naive-CMYK.c +naive_CMYK_la_OBJECTS = naive-CMYK.lo +sse_fixups_la_LIBADD = +sse_fixups_la_SOURCES = sse-fixups.c +sse_fixups_la_OBJECTS = sse_fixups_la-sse-fixups.lo +sse_fixups_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(sse_fixups_la_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) +depcomp = $(SHELL) $(top_srcdir)/depcomp +am__depfiles_maybe = depfiles +COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = CIE-Lab.c gegl-fixups.c gggl-lies.c gggl.c gimp-8bit.c \ + naive-CMYK.c sse-fixups.c +DIST_SOURCES = CIE-Lab.c gegl-fixups.c gggl-lies.c gggl.c gimp-8bit.c \ + naive-CMYK.c sse-fixups.c +HEADERS = $(noinst_HEADERS) +ETAGS = etags +CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -73,13 +117,10 @@ BABL_MINOR_VERSION = @BABL_MINOR_VERSION@ BABL_REAL_VERSION = @BABL_REAL_VERSION@ BABL_RELEASE = @BABL_RELEASE@ BABL_UNSTABLE = @BABL_UNSTABLE@ -BABL_UNSTABLE_FALSE = @BABL_UNSTABLE_FALSE@ -BABL_UNSTABLE_TRUE = @BABL_UNSTABLE_TRUE@ BABL_VERSION = @BABL_VERSION@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -I $(top_builddir) -I $(top_srcdir) -I \ - $(top_srcdir)/babl -I $(top_srcdir)/extensions -fPIC +CFLAGS = @CFLAGS@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ CXX = @CXX@ @@ -92,7 +133,6 @@ DEPDIR = @DEPDIR@ DIR_SEP = @DIR_SEP@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ -DYNAMICLIB = @DYNAMICLIB@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -102,34 +142,25 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ -HAVE_INKSCAPE_FALSE = @HAVE_INKSCAPE_FALSE@ -HAVE_INKSCAPE_TRUE = @HAVE_INKSCAPE_TRUE@ -HAVE_W3M_FALSE = @HAVE_W3M_FALSE@ -HAVE_W3M_TRUE = @HAVE_W3M_TRUE@ -INKSCAPE = @INKSCAPE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LDFLAGS = @LDFLAGS@ $(DYNAMICLIB) +LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ +LIBS = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la $(MATH_LIB) LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MATH_LIB = @MATH_LIB@ +MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_UNIX_FALSE = @OS_UNIX_FALSE@ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -138,9 +169,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEP = @PATH_SEP@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +RSVG = @RSVG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -151,13 +181,13 @@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ WEBSITE_LOCATION = @WEBSITE_LOCATION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -169,6 +199,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -196,20 +227,36 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -@OS_WIN32_TRUE@no_undefined = -no-undefined -@OS_WIN32_TRUE@libbabldlla = $(top_builddir)/babl/.libs/libbabl-$(BABL_API_VERSION).dll.a -CFILES = $(wildcard $(srcdir)/*.c) -SOBJS = $(subst $(srcdir)/,,$(CFILES:.c=$(SHREXT))) -INSTALLED_ITEMS = $(subst $(srcdir),$(ext_dir),$(CFILES:.c=$(SHREXT))) -EXTRA_DIST = $(wildcard *.[ch]) -@OS_WIN32_FALSE@LDADD = $(top_builddir)/babl/.libs/libbabl-$(BABL_API_VERSION)$(SHREXT) $(MATH_LIB) -@OS_WIN32_TRUE@LDADD = $(no-undefined) $(libbabldlla) $(MATH_LIB) -ext_dir = $(DESTDIR)$(libdir)/babl-@BABL_API_VERSION@ +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +@OS_WIN32_FALSE@AM_LDFLAGS = -module +@OS_WIN32_TRUE@AM_LDFLAGS = -module -no-undefined +noinst_HEADERS = util.h +AM_CPPFLAGS = \ + -I$(top_builddir) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/babl \ + -I$(top_srcdir)/extensions + +extdir = $(DESTDIR)$(libdir)/babl-@BABL_API_VERSION@ +ext_LTLIBRARIES = \ + CIE-Lab.la \ + gegl-fixups.la \ + gggl-lies.la \ + gggl.la \ + gimp-8bit.la \ + naive-CMYK.la \ + sse-fixups.la + +sse_fixups_la_CFLAGS = $(MMX_EXTRA_CFLAGS) $(SSE_EXTRA_CFLAGS) all: all-am .SUFFIXES: +.SUFFIXES: .c .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -239,6 +286,89 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +install-extLTLIBRARIES: $(ext_LTLIBRARIES) + @$(NORMAL_INSTALL) + test -z "$(extdir)" || $(MKDIR_P) "$(DESTDIR)$(extdir)" + @list='$(ext_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + f=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(extLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(extdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(extLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(extdir)/$$f"; \ + else :; fi; \ + done + +uninstall-extLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(ext_LTLIBRARIES)'; for p in $$list; do \ + p=$(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(extdir)/$$p'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(extdir)/$$p"; \ + done + +clean-extLTLIBRARIES: + -test -z "$(ext_LTLIBRARIES)" || rm -f $(ext_LTLIBRARIES) + @list='$(ext_LTLIBRARIES)'; for p in $$list; do \ + dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ + test "$$dir" != "$$p" || dir=.; \ + echo "rm -f \"$${dir}/so_locations\""; \ + rm -f "$${dir}/so_locations"; \ + done +CIE-Lab.la: $(CIE_Lab_la_OBJECTS) $(CIE_Lab_la_DEPENDENCIES) + $(LINK) -rpath $(extdir) $(CIE_Lab_la_OBJECTS) $(CIE_Lab_la_LIBADD) $(LIBS) +gegl-fixups.la: $(gegl_fixups_la_OBJECTS) $(gegl_fixups_la_DEPENDENCIES) + $(LINK) -rpath $(extdir) $(gegl_fixups_la_OBJECTS) $(gegl_fixups_la_LIBADD) $(LIBS) +gggl-lies.la: $(gggl_lies_la_OBJECTS) $(gggl_lies_la_DEPENDENCIES) + $(LINK) -rpath $(extdir) $(gggl_lies_la_OBJECTS) $(gggl_lies_la_LIBADD) $(LIBS) +gggl.la: $(gggl_la_OBJECTS) $(gggl_la_DEPENDENCIES) + $(LINK) -rpath $(extdir) $(gggl_la_OBJECTS) $(gggl_la_LIBADD) $(LIBS) +gimp-8bit.la: $(gimp_8bit_la_OBJECTS) $(gimp_8bit_la_DEPENDENCIES) + $(LINK) -rpath $(extdir) $(gimp_8bit_la_OBJECTS) $(gimp_8bit_la_LIBADD) $(LIBS) +naive-CMYK.la: $(naive_CMYK_la_OBJECTS) $(naive_CMYK_la_DEPENDENCIES) + $(LINK) -rpath $(extdir) $(naive_CMYK_la_OBJECTS) $(naive_CMYK_la_LIBADD) $(LIBS) +sse-fixups.la: $(sse_fixups_la_OBJECTS) $(sse_fixups_la_DEPENDENCIES) + $(sse_fixups_la_LINK) -rpath $(extdir) $(sse_fixups_la_OBJECTS) $(sse_fixups_la_LIBADD) $(LIBS) + +mostlyclean-compile: + -rm -f *.$(OBJEXT) + +distclean-compile: + -rm -f *.tab.c + +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/CIE-Lab.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gegl-fixups.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gggl-lies.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gggl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-8bit.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/naive-CMYK.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sse_fixups_la-sse-fixups.Plo@am__quote@ + +.c.o: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c $< + +.c.obj: +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` + +.c.lo: +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< + +sse_fixups_la-sse-fixups.lo: sse-fixups.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sse_fixups_la_CFLAGS) $(CFLAGS) -MT sse_fixups_la-sse-fixups.lo -MD -MP -MF $(DEPDIR)/sse_fixups_la-sse-fixups.Tpo -c -o sse_fixups_la-sse-fixups.lo `test -f 'sse-fixups.c' || echo '$(srcdir)/'`sse-fixups.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/sse_fixups_la-sse-fixups.Tpo $(DEPDIR)/sse_fixups_la-sse-fixups.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sse-fixups.c' object='sse_fixups_la-sse-fixups.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(sse_fixups_la_CFLAGS) $(CFLAGS) -c -o sse_fixups_la-sse-fixups.lo `test -f 'sse-fixups.c' || echo '$(srcdir)/'`sse-fixups.c mostlyclean-libtool: -rm -f *.lo @@ -246,33 +376,69 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + mkid -fID $$unique tags: TAGS -TAGS: +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi ctags: CTAGS -CTAGS: - +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -284,10 +450,12 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-local check: check-am -all-am: Makefile all-local +all-am: Makefile $(LTLIBRARIES) $(HEADERS) installdirs: + for dir in "$(DESTDIR)$(extdir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done install: install-am install-exec: install-exec-am install-data: install-data-am @@ -314,11 +482,14 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-local mostlyclean-am +clean-am: clean-extLTLIBRARIES clean-generic clean-libtool \ + mostlyclean-am distclean: distclean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile -distclean-am: clean-am distclean-generic distclean-libtool +distclean-am: clean-am distclean-compile distclean-generic \ + distclean-tags dvi: dvi-am @@ -330,23 +501,33 @@ info: info-am info-am: -install-data-am: +install-data-am: install-extLTLIBRARIES + +install-dvi: install-dvi-am -install-exec-am: install-exec-local +install-exec-am: + +install-html: install-html-am install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-generic mostlyclean-libtool +mostlyclean-am: mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf: pdf-am @@ -356,50 +537,25 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am uninstall-local +uninstall-am: uninstall-extLTLIBRARIES + +.MAKE: install-am install-strip -.PHONY: all all-am all-local check check-am check-local clean \ - clean-generic clean-libtool clean-local distclean \ - distclean-generic distclean-libtool distdir dvi dvi-am html \ +.PHONY: CTAGS GTAGS all all-am check check-am clean \ + clean-extLTLIBRARIES clean-generic clean-libtool ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am \ - install-exec-local install-info install-info-am install-man \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-extLTLIBRARIES install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-ps install-ps-am \ install-strip installcheck installcheck-am installdirs \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-info-am uninstall-local - - -all-local: $(SOBJS) - -%$(SHREXT): %.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) - -# if extension needing external libraries are to be # compiled with this make -# file, each of them can be added according to the this pattern: -# extra$(SHREXT): extra.c -# $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< [own compile and link flags] - -CIE-Lab$(SHREXT): CIE-Lab.c - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) - -sse-fixups$(SHREXT): sse-fixups.c - $(CC) $(CFLAGS) $(MMX_EXTRA_CFLAGS) $(SSE_EXTRA_CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) -#lcms$(SHREXT): lcms.c -# $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) `pkg-config lcms --cflags --libs` -############################################################################# - -clean-local: - rm -f $(SOBJS) - -install-exec-local: all-local - $(INSTALL) -d $(ext_dir) - $(INSTALL) $(SOBJS) $(ext_dir) - -uninstall-local: - rm -f $(INSTALLED_ITEMS) + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags uninstall uninstall-am \ + uninstall-extLTLIBRARIES -check-local: all-local # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/extensions/gegl-fixups.c b/extensions/gegl-fixups.c index 084db94..4ee87a8 100644 --- a/extensions/gegl-fixups.c +++ b/extensions/gegl-fixups.c @@ -39,6 +39,9 @@ * TODO: error diffusion, */ +#include + +#include "config.h" #include "babl.h" #include "base/util.h" @@ -333,18 +336,14 @@ conv_rgbAF_sdl32 (unsigned char *srcc, { int i; float alpha = src[3]; - if (alpha < 0.0001) - alpha = 0.0001; for (i = 0; i < 3; i++) { float ca = src[i]; - float c; int ret; - c = ca / alpha; - if (alpha == 0.0) + if (alpha < BABL_ALPHA_THRESHOLD) ret = 0; else - ret = table_F_8g[gggl_float_to_index16 (c)]; + ret = table_F_8g[gggl_float_to_index16 (ca / alpha)]; if (ret <= 0) dst[i] = 0; else if (ret > 255) @@ -397,7 +396,7 @@ conv_rgbAF_rgb8 (unsigned char *srcc, while (n--) { float alpha = src[3]; - if (alpha < 0.00001) + if (alpha < BABL_ALPHA_THRESHOLD) { dst[0] = 0; dst[1] = 0; @@ -439,6 +438,88 @@ conv_bgrA8_rgba8 (unsigned char *srcc, } +static long +conv_rgbaF_rgbAF (unsigned char *srcc, + unsigned char *dstc, + long samples) +{ + float *src = (void *) srcc; + float *dst = (void *) dstc; + long n = samples; + + while (n--) + { + float alpha = src[3]; + dst[0] = src[0] * alpha; + dst[1] = src[1] * alpha; + dst[2] = src[2] * alpha; + dst[3] = alpha; + src += 4; + dst += 4; + } + return samples; +} + + +static long +conv_rgbAF_rgbaF (unsigned char *srcc, + unsigned char *dstc, + long samples) +{ + float *src = (void *) srcc; + float *dst = (void *) dstc; + long n = samples; + + while (n--) + { + float alpha = src[3]; + float recip = 1.0/alpha; + if (alpha < BABL_ALPHA_THRESHOLD) + recip = 0.0; + dst[0] = src[0] * recip; + dst[1] = src[1] * recip; + dst[2] = src[2] * recip; + dst[3] = alpha; + src += 4; + dst += 4; + } + return samples; +} + + + +static long +conv_rgbAF_lrgba8 (unsigned char *srcc, + unsigned char *dstc, + long samples) +{ + float *src = (void *) srcc; + unsigned char *dst = (void *) dstc; + long n = samples; + + while (n--) + { + float alpha = src[3]; + float recip = (1.0/alpha); + if (alpha < BABL_ALPHA_THRESHOLD) + { + dst[0] = dst[1] = dst[2] = dst[3] = 0; + } + else + { + dst[0] = table_F_8[gggl_float_to_index16 (src[0] * recip)]; + dst[1] = table_F_8[gggl_float_to_index16 (src[1] * recip)]; + dst[2] = table_F_8[gggl_float_to_index16 (src[2] * recip)]; + dst[3] = table_F_8[gggl_float_to_index16 (alpha)]; + } + src += 4; + dst += 4; + } + return samples; +} + + + #define conv_rgb8_rgbAF conv_rgb8_rgbaF int init (void); @@ -462,6 +543,16 @@ init (void) babl_component ("Ba"), babl_component ("A"), NULL); + + Babl *lrgba8 = babl_format_new ( + babl_model ("RGBA"), + babl_type ("u8"), + babl_component ("R"), + babl_component ("G"), + babl_component ("B"), + babl_component ("A"), + NULL); + Babl *rgba8 = babl_format_new ( babl_model ("R'G'B'A"), babl_type ("u8"), @@ -501,6 +592,9 @@ init (void) #define o(src, dst) \ babl_conversion_new (src, dst, "linear", conv_ ## src ## _ ## dst, NULL) + o (rgbaF, rgbAF); + o (rgbAF, rgbaF); + o (rgbAF, lrgba8); o (rgb8, rgbaF); o (rgb8, rgbAF); o (rgba8, rgbaF); diff --git a/extensions/gggl-lies.c b/extensions/gggl-lies.c index 0fcfd7b..b93d47c 100644 --- a/extensions/gggl-lies.c +++ b/extensions/gggl-lies.c @@ -23,6 +23,7 @@ * Copyright 2003, 2004, 2005 Øyvind Kolås */ +#include "config.h" #include #include diff --git a/extensions/gggl.c b/extensions/gggl.c index e24e51c..faf28ec 100644 --- a/extensions/gggl.c +++ b/extensions/gggl.c @@ -21,6 +21,7 @@ * Copyright 2003, 2004, 2005 Øyvind Kolås */ +#include "config.h" #include #include diff --git a/extensions/gimp-8bit.c b/extensions/gimp-8bit.c index 7868cb8..cd6b89f 100644 --- a/extensions/gimp-8bit.c +++ b/extensions/gimp-8bit.c @@ -19,6 +19,7 @@ * . */ +#include "config.h" #include #include "babl.h" diff --git a/extensions/naive-CMYK.c b/extensions/naive-CMYK.c index 783df34..75723da 100644 --- a/extensions/naive-CMYK.c +++ b/extensions/naive-CMYK.c @@ -17,7 +17,6 @@ */ #include "config.h" - #include #include diff --git a/extensions/sse-fixups.c b/extensions/sse-fixups.c index 1cf90ab..1866556 100644 --- a/extensions/sse-fixups.c +++ b/extensions/sse-fixups.c @@ -23,6 +23,8 @@ #if defined(__GNUC__) && (__GNUC__ >= 4) && defined(USE_SSE) && defined(USE_MMX) +#include + #include "babl.h" #include "babl-cpuaccel.h" #include "extensions/util.h" diff --git a/extensions/util.h b/extensions/util.h index 1e6b070..cb872f8 100644 --- a/extensions/util.h +++ b/extensions/util.h @@ -22,7 +22,9 @@ #include #include -#include "config.h" +#ifndef BABL_LIBRARY +#error "config.h must be included prior to util.h" +#endif #ifndef HAVE_RINT # define rint(f) (floor (((double) (f)) + 0.5)) diff --git a/install-sh b/install-sh index 4d4a951..a5897de 100755 --- a/install-sh +++ b/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-05-14.22 +scriptversion=2006-12-25.00 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -39,38 +39,68 @@ scriptversion=2005-05-14.22 # when there is no Makefile. # # This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. +# from scratch. + +nl=' +' +IFS=" "" $nl" # set DOITPROG to echo to test this script # Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" +doit=${DOITPROG-} +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi -# put in absolute paths if you don't have them in your path; or use env. vars. +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +chgrpprog=${CHGRPPROG-chgrp} +chmodprog=${CHMODPROG-chmod} +chownprog=${CHOWNPROG-chown} +cmpprog=${CMPPROG-cmp} +cpprog=${CPPROG-cp} +mkdirprog=${MKDIRPROG-mkdir} +mvprog=${MVPROG-mv} +rmprog=${RMPROG-rm} +stripprog=${STRIPPROG-strip} + +posix_glob='?' +initialize_posix_glob=' + test "$posix_glob" != "?" || { + if (set -f) 2>/dev/null; then + posix_glob= + else + posix_glob=: + fi + } +' -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" +posix_mkdir= + +# Desired mode of installed file. +mode=0755 -chmodcmd="$chmodprog 0755" -chowncmd= chgrpcmd= -stripcmd= +chmodcmd=$chmodprog +chowncmd= +mvcmd=$mvprog rmcmd="$rmprog -f" -mvcmd="$mvprog" +stripcmd= + src= dst= dir_arg= -dstarg= +dst_arg= + +copy_on_change=false no_target_directory= -usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE +usage="\ +Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE or: $0 [OPTION]... SRCFILES... DIRECTORY or: $0 [OPTION]... -t DIRECTORY SRCFILES... or: $0 [OPTION]... -d DIRECTORIES... @@ -80,81 +110,86 @@ In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. In the 4th, create DIRECTORIES. Options: --c (ignored) --d create directories instead of installing files. --g GROUP $chgrpprog installed files to GROUP. --m MODE $chmodprog installed files to MODE. --o USER $chownprog installed files to USER. --s $stripprog installed files. --t DIRECTORY install into DIRECTORY. --T report an error if DSTFILE is a directory. ---help display this help and exit. ---version display version info and exit. + --help display this help and exit. + --version display version info and exit. + + -c (ignored) + -C install only if different (preserve the last data modification time) + -d create directories instead of installing files. + -g GROUP $chgrpprog installed files to GROUP. + -m MODE $chmodprog installed files to MODE. + -o USER $chownprog installed files to USER. + -s $stripprog installed files. + -t DIRECTORY install into DIRECTORY. + -T report an error if DSTFILE is a directory. Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG + CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG + RMPROG STRIPPROG " -while test -n "$1"; do +while test $# -ne 0; do case $1 in - -c) shift - continue;; + -c) ;; + + -C) copy_on_change=true;; - -d) dir_arg=true - shift - continue;; + -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; + shift;; --help) echo "$usage"; exit $?;; - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; + -m) mode=$2 + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift - shift - continue;; + shift;; - -s) stripcmd=$stripprog - shift - continue;; + -s) stripcmd=$stripprog;; - -t) dstarg=$2 - shift - shift - continue;; + -t) dst_arg=$2 + shift;; - -T) no_target_directory=true - shift - continue;; + -T) no_target_directory=true;; --version) echo "$0 $scriptversion"; exit $?;; - *) # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - test -n "$dir_arg$dstarg" && break - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dstarg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dstarg" - shift # fnord - fi - shift # arg - dstarg=$arg - done + --) shift break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; esac + shift done -if test -z "$1"; then +if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dst_arg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dst_arg" + shift # fnord + fi + shift # arg + dst_arg=$arg + done +fi + +if test $# -eq 0; then if test -z "$dir_arg"; then echo "$0: no input file specified." >&2 exit 1 @@ -164,24 +199,47 @@ if test -z "$1"; then exit 0 fi +if test -z "$dir_arg"; then + trap '(exit $?); exit' 1 2 13 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + for src do # Protect names starting with `-'. case $src in - -*) src=./$src ;; + -*) src=./$src;; esac if test -n "$dir_arg"; then dst=$src - src= - - if test -d "$dst"; then - mkdircmd=: - chmodcmd= - else - mkdircmd=$mkdirprog - fi + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command # might cause directories to be created, which would be especially bad # if $src (and thus $dsttmp) contains '*'. @@ -190,71 +248,199 @@ do exit 1 fi - if test -z "$dstarg"; then + if test -z "$dst_arg"; then echo "$0: no destination specified." >&2 exit 1 fi - dst=$dstarg + dst=$dst_arg # Protect names starting with `-'. case $dst in - -*) dst=./$dst ;; + -*) dst=./$dst;; esac # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then if test -n "$no_target_directory"; then - echo "$0: $dstarg: Is a directory" >&2 + echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi - dst=$dst/`basename "$src"` + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? fi fi - # This sed command emulates the dirname command. - dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac - # Make sure that the destination directory exists. + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else - # Skip lots of stat calls in the usual case. - if test ! -d "$dstdir"; then - defaultIFS=' - ' - IFS="${IFS-$defaultIFS}" + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. - oIFS=$IFS - # Some sh's can't handle IFS=/ for some reason. - IFS='%' - set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` - shift - IFS=$oIFS + case $dstdir in + /*) prefix='/';; + -*) prefix='./';; + *) prefix='';; + esac - pathcomp= + eval "$initialize_posix_glob" - while test $# -ne 0 ; do - pathcomp=$pathcomp$1 + oIFS=$IFS + IFS=/ + $posix_glob set -f + set fnord $dstdir shift - if test ! -d "$pathcomp"; then - $mkdirprog "$pathcomp" - # mkdir can fail with a `File exist' error in case several - # install-sh are creating the directory concurrently. This - # is OK. - test -d "$pathcomp" || exit + $posix_glob set +f + IFS=$oIFS + + prefixes= + + for d + do + test -z "$d" && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi - pathcomp=$pathcomp/ - done + fi fi if test -n "$dir_arg"; then - $doit $mkdircmd "$dst" \ - && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } - + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 else - dstfile=`basename "$dst"` # Make a couple of temp file names in the proper directory. dsttmp=$dstdir/_inst.$$_ @@ -262,10 +448,9 @@ do # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - trap '(exit $?); exit' 1 2 13 15 # Copy the file name to the temp name. - $doit $cpprog "$src" "$dsttmp" && + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # @@ -273,48 +458,59 @@ do # ignore errors from any of these, just make sure not to ignore # errors from the above "$doit $cpprog $src $dsttmp" command. # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ - && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ - && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ - && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && - - # Now rename the file to the real destination. - { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ - || { - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - if test -f "$dstdir/$dstfile"; then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ - || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ - || { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit 1 - } - else - : - fi - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - } - } - fi || { (exit 1); exit 1; } + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && + { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && + { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # If -C, don't bother to copy if it wouldn't change the file. + if $copy_on_change && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + + eval "$initialize_posix_glob" && + $posix_glob set -f && + set X $old && old=:$2:$4:$5:$6 && + set X $new && new=:$2:$4:$5:$6 && + $posix_glob set +f && + + test "$old" = "$new" && + $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 + then + rm -f "$dsttmp" + else + # Rename the file to the real destination. + $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || + + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + { + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + fi || exit 1 + + trap '' 0 + fi done -# The final little trick to "correctly" pass the exit status to the exit trap. -{ - (exit 0); exit 0 -} - # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" diff --git a/ltmain.sh b/ltmain.sh index 0bf3848..2bcb848 100644 --- a/ltmain.sh +++ b/ltmain.sh @@ -43,7 +43,7 @@ EXIT_FAILURE=1 PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="1.5.26 Debian 1.5.26-4" +VERSION=1.5.26 TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)" # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE). @@ -2135,10 +2135,7 @@ EOF case $pass in dlopen) libs="$dlfiles" ;; dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; + link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; esac fi if test "$pass" = dlopen; then @@ -3272,11 +3269,6 @@ EOF revision="$number_minor" lt_irix_increment=no ;; - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; esac ;; no) diff --git a/missing b/missing index 894e786..1c8ff70 100755 --- a/missing +++ b/missing @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-06-08.21 +scriptversion=2006-05-10.23 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. @@ -33,6 +33,8 @@ if test $# -eq 0; then fi run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -44,7 +46,7 @@ fi msg="missing on your system" -case "$1" in +case $1 in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -77,6 +79,7 @@ Supported PROGRAM values: aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -106,7 +109,7 @@ esac # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case "$1" in +case $1 in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -135,7 +138,7 @@ esac # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case "$1" in +case $1 in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -164,7 +167,7 @@ WARNING: \`$1' is $msg. You should only need it if test -z "$files" && files="config.h" touch_files= for f in $files; do - case "$f" in + case $f in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -192,8 +195,8 @@ WARNING: \`$1' is needed, but is $msg. You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` - test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -f "$file"; then touch $file else @@ -214,25 +217,25 @@ WARNING: \`$1' $msg. You should only need it if in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if [ ! -f y.tab.h ]; then + if test ! -f y.tab.h; then echo >y.tab.h fi - if [ ! -f y.tab.c ]; then + if test ! -f y.tab.c; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -244,18 +247,18 @@ WARNING: \`$1' is $msg. You should only need it if in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if [ $# -ne 1 ]; then + if test $# -ne 1; then eval LASTARG="\${$#}" - case "$LASTARG" in + case $LASTARG in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if [ -f "$SRCFILE" ]; then + if test -f "$SRCFILE"; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if [ ! -f lex.yy.c ]; then + if test ! -f lex.yy.c; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -267,11 +270,9 @@ WARNING: \`$1' is $msg. You should only need it if \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` - fi - if [ -f "$file" ]; then + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then touch $file else test -z "$file" || exec >$file @@ -289,11 +290,17 @@ WARNING: \`$1' is $msg. You should only need it if DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -317,13 +324,13 @@ WARNING: \`$1' is $msg. You should only need it if fi firstarg="$1" if shift; then - case "$firstarg" in + case $firstarg in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case "$firstarg" in + case $firstarg in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff --git a/tests/Makefile.am b/tests/Makefile.am index 478ac9a..360906b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,19 +8,7 @@ TESTS = \ types \ models -TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions - -grayscale_to_rgb_SOURCES = grayscale_to_rgb.c -rgb_to_bgr_SOURCES = rgb_to_bgr.c -srgb_to_lab_u8_SOURCES = srgb_to_lab_u8.c -rgb_to_ycbcr_SOURCES = rgb_to_ycbcr.c -babl_class_name_SOURCES = babl_class_name.c -sanity_SOURCES = sanity.c -types_SOURCES = types.c -babl_fish_path_fitness_SOURCES = babl_fish_path_fitness.c -babl_fish_path_dhtml_SOURCES = babl_fish_path_dhtml.c -formats_SOURCES = formats.c -models_SOURCES = models.c +TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions/.libs AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl @@ -31,12 +19,8 @@ noinst_PROGRAMS = \ introspect \ babl_fish_path_fitness \ babl_fish_path_dhtml \ - babl_html_dump \ + babl-html-dump \ conversions \ formats \ nop \ $(TESTS) - -introspect_SOURCES = introspect.c -babl_html_dump_SOURCES = babl-html-dump.c -nop_SOURCES = nop.c diff --git a/tests/Makefile.in b/tests/Makefile.in index 59e3ab7..2bc43b5 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,8 +1,8 @@ -# Makefile.in generated by automake 1.9.6 from Makefile.am. +# Makefile.in generated by automake 1.10.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -14,15 +14,11 @@ @SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = .. am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c @@ -36,8 +32,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +TESTS = grayscale_to_rgb$(EXEEXT) rgb_to_bgr$(EXEEXT) \ + rgb_to_ycbcr$(EXEEXT) srgb_to_lab_u8$(EXEEXT) sanity$(EXEEXT) \ + babl_class_name$(EXEEXT) types$(EXEEXT) models$(EXEEXT) noinst_PROGRAMS = introspect$(EXEEXT) babl_fish_path_fitness$(EXEEXT) \ - babl_fish_path_dhtml$(EXEEXT) babl_html_dump$(EXEEXT) \ + babl_fish_path_dhtml$(EXEEXT) babl-html-dump$(EXEEXT) \ conversions$(EXEEXT) formats$(EXEEXT) nop$(EXEEXT) \ $(am__EXEEXT_1) subdir = tests @@ -54,127 +53,121 @@ am__EXEEXT_1 = grayscale_to_rgb$(EXEEXT) rgb_to_bgr$(EXEEXT) \ rgb_to_ycbcr$(EXEEXT) srgb_to_lab_u8$(EXEEXT) sanity$(EXEEXT) \ babl_class_name$(EXEEXT) types$(EXEEXT) models$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) -am_babl_class_name_OBJECTS = babl_class_name.$(OBJEXT) -babl_class_name_OBJECTS = $(am_babl_class_name_OBJECTS) -babl_class_name_LDADD = $(LDADD) +babl_html_dump_SOURCES = babl-html-dump.c +babl_html_dump_OBJECTS = babl-html-dump.$(OBJEXT) +babl_html_dump_LDADD = $(LDADD) am__DEPENDENCIES_1 = +babl_html_dump_DEPENDENCIES = \ + $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ + $(am__DEPENDENCIES_1) +babl_class_name_SOURCES = babl_class_name.c +babl_class_name_OBJECTS = babl_class_name.$(OBJEXT) +babl_class_name_LDADD = $(LDADD) babl_class_name_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_babl_fish_path_dhtml_OBJECTS = babl_fish_path_dhtml.$(OBJEXT) -babl_fish_path_dhtml_OBJECTS = $(am_babl_fish_path_dhtml_OBJECTS) +babl_fish_path_dhtml_SOURCES = babl_fish_path_dhtml.c +babl_fish_path_dhtml_OBJECTS = babl_fish_path_dhtml.$(OBJEXT) babl_fish_path_dhtml_LDADD = $(LDADD) babl_fish_path_dhtml_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_babl_fish_path_fitness_OBJECTS = babl_fish_path_fitness.$(OBJEXT) -babl_fish_path_fitness_OBJECTS = $(am_babl_fish_path_fitness_OBJECTS) +babl_fish_path_fitness_SOURCES = babl_fish_path_fitness.c +babl_fish_path_fitness_OBJECTS = babl_fish_path_fitness.$(OBJEXT) babl_fish_path_fitness_LDADD = $(LDADD) babl_fish_path_fitness_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_babl_html_dump_OBJECTS = babl-html-dump.$(OBJEXT) -babl_html_dump_OBJECTS = $(am_babl_html_dump_OBJECTS) -babl_html_dump_LDADD = $(LDADD) -babl_html_dump_DEPENDENCIES = \ - $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ - $(am__DEPENDENCIES_1) conversions_SOURCES = conversions.c conversions_OBJECTS = conversions.$(OBJEXT) conversions_LDADD = $(LDADD) conversions_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_formats_OBJECTS = formats.$(OBJEXT) -formats_OBJECTS = $(am_formats_OBJECTS) +formats_SOURCES = formats.c +formats_OBJECTS = formats.$(OBJEXT) formats_LDADD = $(LDADD) formats_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_grayscale_to_rgb_OBJECTS = grayscale_to_rgb.$(OBJEXT) -grayscale_to_rgb_OBJECTS = $(am_grayscale_to_rgb_OBJECTS) +grayscale_to_rgb_SOURCES = grayscale_to_rgb.c +grayscale_to_rgb_OBJECTS = grayscale_to_rgb.$(OBJEXT) grayscale_to_rgb_LDADD = $(LDADD) grayscale_to_rgb_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_introspect_OBJECTS = introspect.$(OBJEXT) -introspect_OBJECTS = $(am_introspect_OBJECTS) +introspect_SOURCES = introspect.c +introspect_OBJECTS = introspect.$(OBJEXT) introspect_LDADD = $(LDADD) introspect_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_models_OBJECTS = models.$(OBJEXT) -models_OBJECTS = $(am_models_OBJECTS) +models_SOURCES = models.c +models_OBJECTS = models.$(OBJEXT) models_LDADD = $(LDADD) models_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_nop_OBJECTS = nop.$(OBJEXT) -nop_OBJECTS = $(am_nop_OBJECTS) +nop_SOURCES = nop.c +nop_OBJECTS = nop.$(OBJEXT) nop_LDADD = $(LDADD) nop_DEPENDENCIES = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_rgb_to_bgr_OBJECTS = rgb_to_bgr.$(OBJEXT) -rgb_to_bgr_OBJECTS = $(am_rgb_to_bgr_OBJECTS) +rgb_to_bgr_SOURCES = rgb_to_bgr.c +rgb_to_bgr_OBJECTS = rgb_to_bgr.$(OBJEXT) rgb_to_bgr_LDADD = $(LDADD) rgb_to_bgr_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_rgb_to_ycbcr_OBJECTS = rgb_to_ycbcr.$(OBJEXT) -rgb_to_ycbcr_OBJECTS = $(am_rgb_to_ycbcr_OBJECTS) +rgb_to_ycbcr_SOURCES = rgb_to_ycbcr.c +rgb_to_ycbcr_OBJECTS = rgb_to_ycbcr.$(OBJEXT) rgb_to_ycbcr_LDADD = $(LDADD) rgb_to_ycbcr_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_sanity_OBJECTS = sanity.$(OBJEXT) -sanity_OBJECTS = $(am_sanity_OBJECTS) +sanity_SOURCES = sanity.c +sanity_OBJECTS = sanity.$(OBJEXT) sanity_LDADD = $(LDADD) sanity_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_srgb_to_lab_u8_OBJECTS = srgb_to_lab_u8.$(OBJEXT) -srgb_to_lab_u8_OBJECTS = $(am_srgb_to_lab_u8_OBJECTS) +srgb_to_lab_u8_SOURCES = srgb_to_lab_u8.c +srgb_to_lab_u8_OBJECTS = srgb_to_lab_u8.$(OBJEXT) srgb_to_lab_u8_LDADD = $(LDADD) srgb_to_lab_u8_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -am_types_OBJECTS = types.$(OBJEXT) -types_OBJECTS = $(am_types_OBJECTS) +types_SOURCES = types.c +types_OBJECTS = types.$(OBJEXT) types_LDADD = $(LDADD) types_DEPENDENCIES = \ $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) +DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ - $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(babl_class_name_SOURCES) $(babl_fish_path_dhtml_SOURCES) \ - $(babl_fish_path_fitness_SOURCES) $(babl_html_dump_SOURCES) \ - conversions.c $(formats_SOURCES) $(grayscale_to_rgb_SOURCES) \ - $(introspect_SOURCES) $(models_SOURCES) $(nop_SOURCES) \ - $(rgb_to_bgr_SOURCES) $(rgb_to_ycbcr_SOURCES) \ - $(sanity_SOURCES) $(srgb_to_lab_u8_SOURCES) $(types_SOURCES) -DIST_SOURCES = $(babl_class_name_SOURCES) \ - $(babl_fish_path_dhtml_SOURCES) \ - $(babl_fish_path_fitness_SOURCES) $(babl_html_dump_SOURCES) \ - conversions.c $(formats_SOURCES) $(grayscale_to_rgb_SOURCES) \ - $(introspect_SOURCES) $(models_SOURCES) $(nop_SOURCES) \ - $(rgb_to_bgr_SOURCES) $(rgb_to_ycbcr_SOURCES) \ - $(sanity_SOURCES) $(srgb_to_lab_u8_SOURCES) $(types_SOURCES) +LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ + --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ + $(LDFLAGS) -o $@ +SOURCES = babl-html-dump.c babl_class_name.c babl_fish_path_dhtml.c \ + babl_fish_path_fitness.c conversions.c formats.c \ + grayscale_to_rgb.c introspect.c models.c nop.c rgb_to_bgr.c \ + rgb_to_ycbcr.c sanity.c srgb_to_lab_u8.c types.c +DIST_SOURCES = babl-html-dump.c babl_class_name.c \ + babl_fish_path_dhtml.c babl_fish_path_fitness.c conversions.c \ + formats.c grayscale_to_rgb.c introspect.c models.c nop.c \ + rgb_to_bgr.c rgb_to_ycbcr.c sanity.c srgb_to_lab_u8.c types.c ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@ -AMDEP_FALSE = @AMDEP_FALSE@ -AMDEP_TRUE = @AMDEP_TRUE@ AMTAR = @AMTAR@ AR = @AR@ AS = @AS@ @@ -193,8 +186,6 @@ BABL_MINOR_VERSION = @BABL_MINOR_VERSION@ BABL_REAL_VERSION = @BABL_REAL_VERSION@ BABL_RELEASE = @BABL_RELEASE@ BABL_UNSTABLE = @BABL_UNSTABLE@ -BABL_UNSTABLE_FALSE = @BABL_UNSTABLE_FALSE@ -BABL_UNSTABLE_TRUE = @BABL_UNSTABLE_TRUE@ BABL_VERSION = @BABL_VERSION@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ @@ -211,7 +202,6 @@ DEPDIR = @DEPDIR@ DIR_SEP = @DIR_SEP@ DLLTOOL = @DLLTOOL@ DSYMUTIL = @DSYMUTIL@ -DYNAMICLIB = @DYNAMICLIB@ ECHO = @ECHO@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ @@ -221,11 +211,7 @@ EXEEXT = @EXEEXT@ F77 = @F77@ FFLAGS = @FFLAGS@ GREP = @GREP@ -HAVE_INKSCAPE_FALSE = @HAVE_INKSCAPE_FALSE@ -HAVE_INKSCAPE_TRUE = @HAVE_INKSCAPE_TRUE@ -HAVE_W3M_FALSE = @HAVE_W3M_FALSE@ -HAVE_W3M_TRUE = @HAVE_W3M_TRUE@ -INKSCAPE = @INKSCAPE@ +INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ @@ -237,18 +223,13 @@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ LTLIBOBJS = @LTLIBOBJS@ MAINT = @MAINT@ -MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ -MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MATH_LIB = @MATH_LIB@ +MKDIR_P = @MKDIR_P@ MMX_EXTRA_CFLAGS = @MMX_EXTRA_CFLAGS@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ OBJEXT = @OBJEXT@ -OS_UNIX_FALSE = @OS_UNIX_FALSE@ -OS_UNIX_TRUE = @OS_UNIX_TRUE@ -OS_WIN32_FALSE = @OS_WIN32_FALSE@ -OS_WIN32_TRUE = @OS_WIN32_TRUE@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ PACKAGE_NAME = @PACKAGE_NAME@ @@ -257,9 +238,8 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEP = @PATH_SEP@ PATH_SEPARATOR = @PATH_SEPARATOR@ -PLATFORM_WIN32_FALSE = @PLATFORM_WIN32_FALSE@ -PLATFORM_WIN32_TRUE = @PLATFORM_WIN32_TRUE@ RANLIB = @RANLIB@ +RSVG = @RSVG@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ @@ -270,13 +250,13 @@ VERSION = @VERSION@ W3M = @W3M@ WEBSITE_HOST = @WEBSITE_HOST@ WEBSITE_LOCATION = @WEBSITE_LOCATION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_F77 = @ac_ct_F77@ -am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ -am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ -am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ @@ -288,6 +268,7 @@ build_alias = @build_alias@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ +builddir = @builddir@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ @@ -315,37 +296,17 @@ program_transform_name = @program_transform_name@ psdir = @psdir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -TESTS = \ - grayscale_to_rgb \ - rgb_to_bgr \ - rgb_to_ycbcr \ - srgb_to_lab_u8 \ - sanity \ - babl_class_name \ - types \ - models - -TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions -grayscale_to_rgb_SOURCES = grayscale_to_rgb.c -rgb_to_bgr_SOURCES = rgb_to_bgr.c -srgb_to_lab_u8_SOURCES = srgb_to_lab_u8.c -rgb_to_ycbcr_SOURCES = rgb_to_ycbcr.c -babl_class_name_SOURCES = babl_class_name.c -sanity_SOURCES = sanity.c -types_SOURCES = types.c -babl_fish_path_fitness_SOURCES = babl_fish_path_fitness.c -babl_fish_path_dhtml_SOURCES = babl_fish_path_dhtml.c -formats_SOURCES = formats.c -models_SOURCES = models.c +top_build_prefix = @top_build_prefix@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions/.libs AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(MATH_LIB) -introspect_SOURCES = introspect.c -babl_html_dump_SOURCES = babl-html-dump.c -nop_SOURCES = nop.c all: all-am .SUFFIXES: @@ -386,51 +347,51 @@ clean-noinstPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done +babl-html-dump$(EXEEXT): $(babl_html_dump_OBJECTS) $(babl_html_dump_DEPENDENCIES) + @rm -f babl-html-dump$(EXEEXT) + $(LINK) $(babl_html_dump_OBJECTS) $(babl_html_dump_LDADD) $(LIBS) babl_class_name$(EXEEXT): $(babl_class_name_OBJECTS) $(babl_class_name_DEPENDENCIES) @rm -f babl_class_name$(EXEEXT) - $(LINK) $(babl_class_name_LDFLAGS) $(babl_class_name_OBJECTS) $(babl_class_name_LDADD) $(LIBS) + $(LINK) $(babl_class_name_OBJECTS) $(babl_class_name_LDADD) $(LIBS) babl_fish_path_dhtml$(EXEEXT): $(babl_fish_path_dhtml_OBJECTS) $(babl_fish_path_dhtml_DEPENDENCIES) @rm -f babl_fish_path_dhtml$(EXEEXT) - $(LINK) $(babl_fish_path_dhtml_LDFLAGS) $(babl_fish_path_dhtml_OBJECTS) $(babl_fish_path_dhtml_LDADD) $(LIBS) + $(LINK) $(babl_fish_path_dhtml_OBJECTS) $(babl_fish_path_dhtml_LDADD) $(LIBS) babl_fish_path_fitness$(EXEEXT): $(babl_fish_path_fitness_OBJECTS) $(babl_fish_path_fitness_DEPENDENCIES) @rm -f babl_fish_path_fitness$(EXEEXT) - $(LINK) $(babl_fish_path_fitness_LDFLAGS) $(babl_fish_path_fitness_OBJECTS) $(babl_fish_path_fitness_LDADD) $(LIBS) -babl_html_dump$(EXEEXT): $(babl_html_dump_OBJECTS) $(babl_html_dump_DEPENDENCIES) - @rm -f babl_html_dump$(EXEEXT) - $(LINK) $(babl_html_dump_LDFLAGS) $(babl_html_dump_OBJECTS) $(babl_html_dump_LDADD) $(LIBS) + $(LINK) $(babl_fish_path_fitness_OBJECTS) $(babl_fish_path_fitness_LDADD) $(LIBS) conversions$(EXEEXT): $(conversions_OBJECTS) $(conversions_DEPENDENCIES) @rm -f conversions$(EXEEXT) - $(LINK) $(conversions_LDFLAGS) $(conversions_OBJECTS) $(conversions_LDADD) $(LIBS) + $(LINK) $(conversions_OBJECTS) $(conversions_LDADD) $(LIBS) formats$(EXEEXT): $(formats_OBJECTS) $(formats_DEPENDENCIES) @rm -f formats$(EXEEXT) - $(LINK) $(formats_LDFLAGS) $(formats_OBJECTS) $(formats_LDADD) $(LIBS) + $(LINK) $(formats_OBJECTS) $(formats_LDADD) $(LIBS) grayscale_to_rgb$(EXEEXT): $(grayscale_to_rgb_OBJECTS) $(grayscale_to_rgb_DEPENDENCIES) @rm -f grayscale_to_rgb$(EXEEXT) - $(LINK) $(grayscale_to_rgb_LDFLAGS) $(grayscale_to_rgb_OBJECTS) $(grayscale_to_rgb_LDADD) $(LIBS) + $(LINK) $(grayscale_to_rgb_OBJECTS) $(grayscale_to_rgb_LDADD) $(LIBS) introspect$(EXEEXT): $(introspect_OBJECTS) $(introspect_DEPENDENCIES) @rm -f introspect$(EXEEXT) - $(LINK) $(introspect_LDFLAGS) $(introspect_OBJECTS) $(introspect_LDADD) $(LIBS) + $(LINK) $(introspect_OBJECTS) $(introspect_LDADD) $(LIBS) models$(EXEEXT): $(models_OBJECTS) $(models_DEPENDENCIES) @rm -f models$(EXEEXT) - $(LINK) $(models_LDFLAGS) $(models_OBJECTS) $(models_LDADD) $(LIBS) + $(LINK) $(models_OBJECTS) $(models_LDADD) $(LIBS) nop$(EXEEXT): $(nop_OBJECTS) $(nop_DEPENDENCIES) @rm -f nop$(EXEEXT) - $(LINK) $(nop_LDFLAGS) $(nop_OBJECTS) $(nop_LDADD) $(LIBS) + $(LINK) $(nop_OBJECTS) $(nop_LDADD) $(LIBS) rgb_to_bgr$(EXEEXT): $(rgb_to_bgr_OBJECTS) $(rgb_to_bgr_DEPENDENCIES) @rm -f rgb_to_bgr$(EXEEXT) - $(LINK) $(rgb_to_bgr_LDFLAGS) $(rgb_to_bgr_OBJECTS) $(rgb_to_bgr_LDADD) $(LIBS) + $(LINK) $(rgb_to_bgr_OBJECTS) $(rgb_to_bgr_LDADD) $(LIBS) rgb_to_ycbcr$(EXEEXT): $(rgb_to_ycbcr_OBJECTS) $(rgb_to_ycbcr_DEPENDENCIES) @rm -f rgb_to_ycbcr$(EXEEXT) - $(LINK) $(rgb_to_ycbcr_LDFLAGS) $(rgb_to_ycbcr_OBJECTS) $(rgb_to_ycbcr_LDADD) $(LIBS) + $(LINK) $(rgb_to_ycbcr_OBJECTS) $(rgb_to_ycbcr_LDADD) $(LIBS) sanity$(EXEEXT): $(sanity_OBJECTS) $(sanity_DEPENDENCIES) @rm -f sanity$(EXEEXT) - $(LINK) $(sanity_LDFLAGS) $(sanity_OBJECTS) $(sanity_LDADD) $(LIBS) + $(LINK) $(sanity_OBJECTS) $(sanity_LDADD) $(LIBS) srgb_to_lab_u8$(EXEEXT): $(srgb_to_lab_u8_OBJECTS) $(srgb_to_lab_u8_DEPENDENCIES) @rm -f srgb_to_lab_u8$(EXEEXT) - $(LINK) $(srgb_to_lab_u8_LDFLAGS) $(srgb_to_lab_u8_OBJECTS) $(srgb_to_lab_u8_LDADD) $(LIBS) + $(LINK) $(srgb_to_lab_u8_OBJECTS) $(srgb_to_lab_u8_LDADD) $(LIBS) types$(EXEEXT): $(types_OBJECTS) $(types_DEPENDENCIES) @rm -f types$(EXEEXT) - $(LINK) $(types_LDFLAGS) $(types_OBJECTS) $(types_LDADD) $(LIBS) + $(LINK) $(types_OBJECTS) $(types_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -455,22 +416,22 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/types.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: -@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ -@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi +@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -481,17 +442,13 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -distclean-libtool: - -rm -f libtool -uninstall-info-am: - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ mkid -fID $$unique tags: TAGS @@ -503,8 +460,8 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ @@ -514,13 +471,12 @@ ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ - here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ + $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in files) print i; }; }'`; \ test -z "$(CTAGS_ARGS)$$tags$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$tags $$unique @@ -534,9 +490,9 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ + @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ srcdir=$(srcdir); export srcdir; \ - list='$(TESTS)'; \ + list=' $(TESTS) '; \ if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ @@ -545,7 +501,7 @@ check-TESTS: $(TESTS) if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ - *" $$tst "*) \ + *$$ws$$tst$$ws*) \ xpass=`expr $$xpass + 1`; \ failed=`expr $$failed + 1`; \ echo "XPASS: $$tst"; \ @@ -557,7 +513,7 @@ check-TESTS: $(TESTS) elif test $$? -ne 77; then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ - *" $$tst "*) \ + *$$ws$$tst$$ws*) \ xfail=`expr $$xfail + 1`; \ echo "XFAIL: $$tst"; \ ;; \ @@ -607,22 +563,21 @@ check-TESTS: $(TESTS) else :; fi distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ - list='$(DISTFILES)'; for file in $$list; do \ - case $$file in \ - $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \ - $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \ - esac; \ + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test "$$dir" != "$$file" && test "$$dir" != "."; then \ - dir="/$$dir"; \ - $(mkdir_p) "$(distdir)$$dir"; \ - else \ - dir=''; \ - fi; \ if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ fi; \ @@ -671,7 +626,7 @@ distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ - distclean-libtool distclean-tags + distclean-tags dvi: dvi-am @@ -685,12 +640,20 @@ info-am: install-data-am: +install-dvi: install-dvi-am + install-exec-am: +install-html: install-html-am + install-info: install-info-am install-man: +install-pdf: install-pdf-am + +install-ps: install-ps-am + installcheck-am: maintainer-clean: maintainer-clean-am @@ -711,19 +674,23 @@ ps: ps-am ps-am: -uninstall-am: uninstall-info-am +uninstall-am: + +.MAKE: install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ clean-generic clean-libtool clean-noinstPROGRAMS ctags \ distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ - install-data-am install-exec install-exec-am install-info \ - install-info-am install-man install-strip installcheck \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am + tags uninstall uninstall-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/tests/babl-html-dump.c b/tests/babl-html-dump.c index 9d51e50..4c01611 100644 --- a/tests/babl-html-dump.c +++ b/tests/babl-html-dump.c @@ -17,6 +17,7 @@ * */ +#include "config.h" #include "babl-internal.h" /* needed for babl_log */ static void model_html (Babl *babl); @@ -39,36 +40,36 @@ main (void) printf ("
+"); printf ("-"); printf ("

"); printf ("
Data types
\n"); - babl_type_each (each_item, NULL); + babl_type_class_for_each (each_item, NULL); printf ("
\n"); printf ("
\n"); printf ("
"); printf ("
Color models
\n"); - babl_model_each (each_item, NULL); + babl_model_class_for_each (each_item, NULL); printf ("
\n"); printf ("
\n"); printf ("
"); printf ("
Pixel formats
\n"); - babl_format_each (each_item, NULL); + babl_format_class_for_each (each_item, NULL); printf ("
\n"); printf ("
\n"); @@ -79,7 +80,7 @@ main (void) printf ("\n"); printf ("\n"); */ - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/babl_class_name.c b/tests/babl_class_name.c index a8d3001..8a7bab1 100644 --- a/tests/babl_class_name.c +++ b/tests/babl_class_name.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include #include "babl-internal.h" @@ -68,6 +69,6 @@ main (int argc, babl_init (); if (test ()) return -1; - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/babl_fish_path_dhtml.c b/tests/babl_fish_path_dhtml.c index 9405fc8..b9bcadf 100644 --- a/tests/babl_fish_path_dhtml.c +++ b/tests/babl_fish_path_dhtml.c @@ -1,3 +1,4 @@ +#include "config.h" #include #include "babl-internal.h" @@ -8,7 +9,7 @@ int main (void) babl_set_extender (babl_extension_quiet_log ()); babl_fish_stats (stdout); - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/babl_fish_path_fitness.c b/tests/babl_fish_path_fitness.c index 2f18152..8480fc0 100644 --- a/tests/babl_fish_path_fitness.c +++ b/tests/babl_fish_path_fitness.c @@ -1,6 +1,7 @@ /* perform a symmetricality of conversion test on a set of randomized * RGBA data */ +#include "config.h" #include #include #include "babl-internal.h" @@ -25,9 +26,11 @@ test_init (void) static int qux = 0; static char *utf8_bar[] = { " ", "·", "▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" }; -//static char *utf8_bar[]= {"!","▁","▃","▅","▇","█","!","!","!"}; -//static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", }; -//static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"}; +/* +static char *utf8_bar[]= {"!","▁","▃","▅","▇","█","!","!","!"}; +static char *utf8_bar[]={"·", "█", "▇", "▆", "▅", "▄", "▃", "▂", "▁", }; +static char *utf8_bar[]={" ","1","2","3","4","5","6","7","8"}; +*/ static int destination_each (Babl *babl, void *userdata) @@ -35,7 +38,8 @@ static int destination_each (Babl *babl, Babl *source = userdata; Babl *destination = babl; - if ((qux++) % babl_formats_count () == qux / babl_formats_count ()) + qux++; + if (qux % babl_formats_count () == qux / babl_formats_count ()) printf (" "); else { @@ -63,7 +67,7 @@ static int source_no = 0; static int source_each (Babl *babl, void *userdata) { - babl_format_each (destination_each, babl); + babl_format_class_for_each (destination_each, babl); printf ("──%2i %s\n", source_no++, babl->instance.name); return 0; } @@ -74,7 +78,7 @@ int main (void) test_init (); babl_set_extender (babl_extension_quiet_log ()); - babl_format_each (source_each, NULL); + babl_format_class_for_each (source_each, NULL); { int i; @@ -89,7 +93,7 @@ int main (void) /*printf ("ok / total : %i %i %f\n", ok, total, (1.0*ok) / total); */ - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/conversions.c b/tests/conversions.c index d5f70b6..946bfb9 100644 --- a/tests/conversions.c +++ b/tests/conversions.c @@ -1,6 +1,7 @@ /* perform a symmetricality of conversion test on a set of randomized * RGBA data */ +#include "config.h" #include #include #include "babl-internal.h" @@ -28,9 +29,9 @@ int main (void) babl_init (); babl_set_extender (babl_extension_quiet_log ()); - babl_conversion_each (each_conversion, NULL); + babl_conversion_class_for_each (each_conversion, NULL); - babl_destroy (); + babl_exit (); return !OK; } diff --git a/tests/formats.c b/tests/formats.c index 8967f03..8f481bb 100644 --- a/tests/formats.c +++ b/tests/formats.c @@ -1,6 +1,7 @@ /* perform a symmetricality of conversion test on a set of randomized * RGBA data */ +#include "config.h" #include #include #include "babl-internal.h" @@ -18,9 +19,9 @@ int main (void) babl_init (); babl_set_extender (babl_extension_quiet_log ()); - babl_format_each (format_check, (void *) 1); + babl_format_class_for_each (format_check, (void *) 1); - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/grayscale_to_rgb.c b/tests/grayscale_to_rgb.c index bf38dba..8e004b9 100644 --- a/tests/grayscale_to_rgb.c +++ b/tests/grayscale_to_rgb.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-internal.h" #define PIXELS 5 @@ -76,7 +77,7 @@ main (int argc, babl_init (); if (test ()) return -1; - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/introspect.c b/tests/introspect.c index 1734c3b..b52ed9f 100644 --- a/tests/introspect.c +++ b/tests/introspect.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-internal.h" int @@ -24,6 +25,6 @@ main (int argc, { babl_init (); babl_introspect (NULL); - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/models.c b/tests/models.c index f4bef9e..2920c2f 100644 --- a/tests/models.c +++ b/tests/models.c @@ -1,6 +1,7 @@ /* perform a symmetricality of conversion test on a set of randomized * RGBA data */ +#include "config.h" #include #include #include "babl-internal.h" @@ -25,9 +26,9 @@ int main (void) babl_init (); babl_set_extender (babl_extension_quiet_log ()); - babl_model_each (model_check, NULL); + babl_model_class_for_each (model_check, NULL); - babl_destroy (); + babl_exit (); return !OK; } diff --git a/tests/nop.c b/tests/nop.c index ca21591..7d79dc4 100644 --- a/tests/nop.c +++ b/tests/nop.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl.h" int @@ -23,6 +24,6 @@ main (int argc, char **argv) { babl_init (); - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/rgb_to_bgr.c b/tests/rgb_to_bgr.c index 30774f1..51986ee 100644 --- a/tests/rgb_to_bgr.c +++ b/tests/rgb_to_bgr.c @@ -17,6 +17,7 @@ */ +#include "config.h" #include #include "babl-internal.h" @@ -84,6 +85,6 @@ main (int argc, babl_init (); if (test ()) return -1; - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/rgb_to_ycbcr.c b/tests/rgb_to_ycbcr.c index 9956e70..6efc796 100644 --- a/tests/rgb_to_ycbcr.c +++ b/tests/rgb_to_ycbcr.c @@ -17,6 +17,7 @@ */ +#include "config.h" #include #include "babl-internal.h" @@ -91,6 +92,6 @@ main (int argc, babl_init (); if (test ()) return -1; - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/sanity.c b/tests/sanity.c index e2798e3..d0141c8 100644 --- a/tests/sanity.c +++ b/tests/sanity.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include "babl-internal.h" int @@ -25,6 +26,6 @@ main (int argc, babl_init (); if (!babl_sanity ()) return -1; - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/srgb_to_lab_u8.c b/tests/srgb_to_lab_u8.c index fe41972..d3af0dd 100644 --- a/tests/srgb_to_lab_u8.c +++ b/tests/srgb_to_lab_u8.c @@ -16,6 +16,7 @@ * . */ +#include "config.h" #include #include "babl-internal.h" @@ -71,6 +72,6 @@ main (int argc, babl_init (); if (test ()) return -1; - babl_destroy (); + babl_exit (); return 0; } diff --git a/tests/types.c b/tests/types.c index 5463fb1..1b86cea 100644 --- a/tests/types.c +++ b/tests/types.c @@ -1,3 +1,4 @@ +#include "config.h" #include #include "babl-internal.h" @@ -19,9 +20,9 @@ int main (void) babl_init (); babl_set_extender (babl_extension_quiet_log ()); - babl_type_each (type_check, NULL); + babl_type_class_for_each (type_check, NULL); - babl_destroy (); + babl_exit (); return !OK; } -- 2.30.2